--- libs/Flocale.c
+++ libs/Flocale.c
@@ -427,7 +427,7 @@
 {
 	char *str1, *str2, *str3;
 	int len1;
-	int len2;
+	int len2 = 0;
 	int i;
 	Bool do_iconv = True;
 	const char *bidi_charset;
--- fvwm/infostore.c
+++ fvwm/infostore.c	2012-02-07 09:40:19.454433548 +0000
@@ -58,7 +58,7 @@ MetaInfo *new_metainfo(void)
 	{
 		/* Initialise the main store. */
 		mi_store = (MetaInfo *)safemalloc(sizeof(MetaInfo));
-		memset(&mi_store, '\0', sizeof(MetaInfo));
+		memset(mi_store, '\0', sizeof(MetaInfo));
 	}
 
 	mi = (MetaInfo *)safemalloc(sizeof(MetaInfo));