diff --git a/src/screen.c b/src/screen.c
index 4e6d5dc3..0d352bb9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -715,6 +715,9 @@ wScreenInit(int screen_number)
     XSelectInput(dpy, scr->root_win, event_mask);
 
 #ifdef KEEP_XKB_LOCK_STATUS     
+    /* Only GroupLock doesn't work correctly in my system since right-alt
+     * can change mode while holding it too - ]d
+     */
     if (wXkbSupported) {
         XkbSelectEvents(dpy,XkbUseCoreKbd,
                 XkbStateNotifyMask,
diff --git a/src/winspector.c b/src/winspector.c
index 5109e629..1279841e 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -589,9 +589,9 @@ saveSettings(WMButton *button, InspectorPanel *panel)
 	    assert(wapp->main_window_desc->wm_class!=NULL);
 
 		buffer = wmalloc(strlen(wapp->main_window_desc->wm_instance)
-						 +strlen(wwin->wm_class)+4);
+						 +strlen(wapp->main_window_desc->wm_class)+4);
 	    strcat(strcpy(buffer, wapp->main_window_desc->wm_instance), ".");
-	    strcat(buffer, wwin->wm_class);
+	    strcat(buffer, wapp->main_window_desc->wm_class);
 	    key = PLMakeString(buffer);
 		free(buffer);