diff --git a/common/ChangeLog b/common/ChangeLog
index 4dd266e0f..e9e3e509a 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-26  Werner Koch  <wk@g10code.com>
+
+	* utf8conv.c (load_libiconv) [W32CE]: No libiconv warning
+
+	* init.c (init_common_subsystems) [W32CE]: Register the sleep
+	function before es_init.
+
 2010-04-20  Werner Koch  <wk@g10code.com>
 
 	* estream.c (es_deinit): New.
diff --git a/common/init.c b/common/init.c
index ce661f6c5..aa0b6a7ca 100644
--- a/common/init.c
+++ b/common/init.c
@@ -73,13 +73,21 @@ init_common_subsystems (int *argcp, char ***argvp)
 # ifdef HAVE_PTH
   pth_init ();
 # else
- {
-   WSADATA wsadat;
-
-   WSAStartup (0x202, &wsadat);
- }
+  {
+    WSADATA wsadat;
+    
+    WSAStartup (0x202, &wsadat);
+  }
 # endif /*!HAVE_PTH*/
 #endif
+  
+#ifdef HAVE_W32CE_SYSTEM
+  /* Register the sleep exit function before the estream init so that
+     the sleep will be called after the estream registered atexit
+     function which flushes the left open estream streams and in
+     particular es_stdout.  */
+  atexit (sleep_on_exit);
+#endif
 
   /* Initialize the Estream library. */
   es_init ();
@@ -87,7 +95,6 @@ init_common_subsystems (int *argcp, char ***argvp)
   /* Special hack for Windows CE: We extract some options from arg
      to setup the standard handles.  */
 #ifdef HAVE_W32CE_SYSTEM
-  atexit (sleep_on_exit);
   parse_std_file_handles (argcp, argvp);
 #else
   (void)argcp;
diff --git a/common/utf8conv.c b/common/utf8conv.c
index 6cbe4e92c..4ad514247 100644
--- a/common/utf8conv.c
+++ b/common/utf8conv.c
@@ -62,6 +62,10 @@ static int     (* __stdcall iconv_close) (iconv_t cd);
 static int 
 load_libiconv (void)
 {
+#ifdef HAVE_W32CE_SYSTEM
+  return -1; /* FIXME No libiconv yet - Need to investigate whether it
+                is at all required.  */
+#else
   static int done;
   
   if (!done)
@@ -94,6 +98,7 @@ load_libiconv (void)
         }
     }
   return iconv_open? 0: -1;
+#endif
 }    
 #endif /*HAVE_W32_SYSTEM*/
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7fb50191a..e084916f0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-26  Werner Koch  <wk@g10code.com>
+
+	* keygen.c (keygen_set_std_prefs): Explicitly include Z0 in the
+	default preferences if no compression algorithms are available.
+	Remove a possible trailing space in the dummy_string.
+
 2010-04-23  Werner Koch  <wk@g10code.com>
 
 	* pubkey-enc.c (get_it): Use the agent for decryption.
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 870c21616..210e1feec 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -132,7 +132,7 @@ decrypt_message_fd (int input_fd, int output_fd)
     }
 
 #ifdef HAVE_W32CE_SYSTEM
-#warning Ned to fix this
+#warning Need to fix this
   opt.outfp = NULL;
 #else
   opt.outfp = fdopen (dup (output_fd), "wb");
diff --git a/g10/keygen.c b/g10/keygen.c
index 56a6cc0eb..1be92db06 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -315,6 +315,7 @@ keygen_set_std_prefs (const char *string,int personal)
 	  string=opt.def_preference_list;
 	else
 	  {
+            int any_compress = 0;
 	    dummy_string[0]='\0';
 
             /* The rationale why we use the order AES256,192,128 is
@@ -375,13 +376,31 @@ keygen_set_std_prefs (const char *string,int personal)
 	      strcat (dummy_string, "H11 ");
 
 	    if(!check_compress_algo(COMPRESS_ALGO_ZLIB))
-              strcat(dummy_string,"Z2 ");
+              {
+                strcat(dummy_string,"Z2 ");
+                any_compress = 1;
+              }
 
 	    if(!check_compress_algo(COMPRESS_ALGO_BZIP2))
-	      strcat(dummy_string,"Z3 ");
+              {
+                strcat(dummy_string,"Z3 ");
+                any_compress = 1;
+              }
 
 	    if(!check_compress_algo(COMPRESS_ALGO_ZIP))
-              strcat(dummy_string,"Z1");
+              {
+                strcat(dummy_string,"Z1 ");
+                any_compress = 1;
+              }
+            
+            /* In case we have no compress algo at all, declare that
+               we prefer no compresssion.  */
+            if (!any_compress)
+              strcat(dummy_string,"Z0 ");
+
+            /* Remove the trailing space.  */
+            if (*dummy_string && dummy_string[strlen (dummy_string)-1] == ' ')
+              dummy_string[strlen (dummy_string)-1] = 0;
 
 	    string=dummy_string;
 	  }
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index fed92134e..25f62a684 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -35,6 +35,7 @@
 #include "status.h"
 #include "pkglue.h"
 
+#if 0 /* Not anymore used - kept for reference.  */
 static int
 do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
           int *canceled )
@@ -256,7 +257,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int mode,
 
     return 0;
 }
-
+#endif /*0*/
 
 
 /****************