diff --git a/src/engine-gpgconf.c b/src/engine-gpgconf.c
index 84d8df7b..ba5a73d5 100644
--- a/src/engine-gpgconf.c
+++ b/src/engine-gpgconf.c
@@ -996,7 +996,7 @@ static gpgme_error_t
 gpgconf_config_dir_cb (void *hook, char *line)
 {
   /* This is an input- and output-parameter.  */
-  struct gpgconf_config_dir_s *data = (char **) hook;
+  struct gpgconf_config_dir_s *data = (struct gpgconf_config_dir_s *) hook;
   int len = strlen(data->what);
 
   if (!strncmp(line, data->what, len) && line[len] == ':')
diff --git a/src/key.c b/src/key.c
index e2e30dba..bb4d5fd6 100644
--- a/src/key.c
+++ b/src/key.c
@@ -292,7 +292,7 @@ _gpgme_key_add_sig (gpgme_key_t key, char *src)
 		       &sig->comment, dst);
     }
   else
-    sig->uid = '\0';
+    sig->uid[0] = '\0';
 
   if (!uid->signatures)
     uid->signatures = sig;