diff --git a/src/utils/edit.c b/src/utils/edit.c
index 8dcfb685c..8f9e4ede8 100644
--- a/src/utils/edit.c
+++ b/src/utils/edit.c
@@ -718,6 +718,7 @@ static enum edit_key_code esc_seq_to_key(char *seq)
 	int param1 = -1, param2 = -1;
 	enum edit_key_code ret = EDIT_KEY_NONE;
 
+	last = '\0';
 	for (pos = seq; *pos; pos++)
 		last = *pos;
 
diff --git a/wlantest/process.c b/wlantest/process.c
index 974529c70..a4dd87d83 100644
--- a/wlantest/process.c
+++ b/wlantest/process.c
@@ -80,11 +80,13 @@ static struct wlantest_sta * rx_get_sta(struct wlantest *wt,
 		} else
 			return NULL;
 		break;
+	default:
+		return NULL;
 	}
 
 	bss = bss_find(wt, bssid);
 	if (bss == NULL)
-		return 0;
+		return NULL;
 	return sta_find(bss, sta_addr);
 }