diff --git a/Makefile b/Makefile
index 3239cb7..b542ad1 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,9 @@ $(QEMU_DIR)/config-host.h:
 $(QEMU_OBJS): dummy
 	+$(MAKE) -C $(QEMU_DIR) -f Makefile-small
 
+clean-qemu:
+	$(MAKE) -C $(QEMU_DIR) -f Makefile-small clean
+
 # Depend
 MAKEDEPEND = $(CC) -MM
 
@@ -180,17 +183,13 @@ depend: depend-libs
 	$(MAKEDEPEND) $(X49GP_CFLAGS) $(SRCS) >.depend
 
 # Cleaning
-clean-qemu:
-	$(MAKE) -C $(QEMU_DIR) -f Makefile-small clean
-
-clean: clean-qemu
+clean:
 	rm -f ./src/x49gpng/*.o core *~ .depend
 
-distclean: clean
-	$(MAKE) -C $(QEMU_DIR) -f Makefile-small distclean
+distclean: clean clean-qemu
 	rm -f dist/$(TARGET) dist/$(TARGET).desktop dist/$(TARGET).man
 
-mrproper: clean-qemu distclean
+mrproper: distclean
 	make -C dist/firmware/ mrproper
 
 # auto-format code
diff --git a/src/x49gpng/ui.c b/src/x49gpng/ui.c
index 4c2ea85..64def63 100644
--- a/src/x49gpng/ui.c
+++ b/src/x49gpng/ui.c
@@ -2358,8 +2358,8 @@ static gboolean x49gp_ui_button_press( GtkWidget* widget, GdkEventButton* event,
 static void x49gp_release_single_button( x49gp_ui_button_t* button, x49gp_ui_button_t* cause )
 {
     x49gp_t* x49gp = button->x49gp;
-    const x49gp_ui_key_t* key;
-    GtkButton* gtkbutton;
+    const x49gp_ui_key_t* key = button->key;
+    GtkButton* gtkbutton = GTK_BUTTON( button->button );
 
     /* #ifdef DEBUG_X49GP_UI */
     /*     printf( "%s: button %u: col %u, row %u, eint %u\n", __FUNCTION__, event->button, button->key->column, button->key->row, */
@@ -2369,14 +2369,10 @@ static void x49gp_release_single_button( x49gp_ui_button_t* button, x49gp_ui_but
     button->down = false;
     button->hold = false;
 
-    gtkbutton = GTK_BUTTON( button->button );
-
     /* if ( button != cause ) */
     /*     gtkbutton->in_button = false; */
     gtk_button_released( gtkbutton );
 
-    key = button->key;
-
     if ( key->rowbit )
         s3c2410_io_port_g_update( x49gp, key->column, key->row, key->columnbit, key->rowbit, 0 );
     else