diff --git a/secure.c b/secure.c
index 55ee69e..b6198ba 100644
--- a/secure.c
+++ b/secure.c
@@ -825,7 +825,8 @@ sec_recv(uint8 * rdpver)
 		if (channel != MCS_GLOBAL_CHANNEL)
 		{
 			channel_process(s, channel);
-			*rdpver = 0xff;
+			if (rdpver != NULL)
+				*rdpver = 0xff;
 			return s;
 		}
 
diff --git a/xkeymap.c b/xkeymap.c
index 90ab3f1..644fd76 100644
--- a/xkeymap.c
+++ b/xkeymap.c
@@ -820,7 +820,7 @@ save_remote_modifiers(uint8 scancode)
 void
 restore_remote_modifiers(uint32 ev_time, uint8 scancode)
 {
-	key_translation dummy;
+	key_translation dummy = { };
 
 	if (is_modifier(scancode))
 		return;