diff --git a/sm/certreqgen-ui.c b/sm/certreqgen-ui.c
index 368dc5567..3ccd048c7 100644
--- a/sm/certreqgen-ui.c
+++ b/sm/certreqgen-ui.c
@@ -147,7 +147,6 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estream_t output_stream)
   char *subject_name;
   membuf_t mb_email, mb_dns, mb_uri, mb_result;
   char *result = NULL;
-  int i;
   const char *s, *s2;
   int selfsigned;
 
@@ -381,7 +380,7 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estream_t output_stream)
     goto mem_error;
 
   tty_printf (_("These parameters are used:\n"));
-  for (s=result; (s2 = strchr (s, '\n')); s = s2+1, i++)
+  for (s=result; (s2 = strchr (s, '\n')); s = s2+1)
     tty_printf ("    %.*s\n", (int)(s2-s), s);
   tty_printf ("\n");
 
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 241e67df4..9720b80e2 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -437,7 +437,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para,
   char numbuf[20];
   unsigned char keyparms[100];
   int rc = 0;
-  ksba_sexp_t public;
+  ksba_sexp_t public = NULL;
   ksba_sexp_t sigkey = NULL;
   int seq;
   size_t erroff, errlen;