diff --git a/linux/dlgpiece.cpp b/linux/dlgpiece.cpp
index bf59f257..17e0f9f1 100755
--- a/linux/dlgpiece.cpp
+++ b/linux/dlgpiece.cpp
@@ -246,7 +246,7 @@ static void minifigdlg_createpair (LC_MINIFIGDLG_STRUCT* info, int idx, int num,
     return;
   }
 
-  adj = gtk_adjustment_new (0, -180, 180, 1, 10, 10);
+  adj = gtk_adjustment_new (0, -180, 180, 1, 10, 0);
   gtk_signal_connect (adj, "value_changed", GTK_SIGNAL_FUNC (adj_changed), info);
 
   spin = info->angles[num] = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 1, 0);
diff --git a/linux/system.cpp b/linux/system.cpp
index 5f64ae2c..536dcfd8 100644
--- a/linux/system.cpp
+++ b/linux/system.cpp
@@ -291,17 +291,20 @@ void SystemUpdateAction(int new_action, int old_action)
   GdkColor white = {0, 0xffff, 0xffff, 0xffff};
   GdkColor black = {0, 0x0000, 0x0000, 0x0000};
 
-  if (xpm != NULL)
+  if (GDK_IS_WINDOW(drawing_area))
   {
-    create_bitmap_and_mask_from_xpm (&bitmap, &mask, xpm);
-    cursor = gdk_cursor_new_from_pixmap (bitmap, mask, &white, &black, x, y);
-    gdk_window_set_cursor (drawing_area->window, cursor);
-  }
-  else
-  {
-    cursor = gdk_cursor_new (GDK_LEFT_PTR);
-    gdk_window_set_cursor (drawing_area->window, cursor);
-    gdk_cursor_destroy (cursor);
+    if (xpm != NULL)
+    {
+      create_bitmap_and_mask_from_xpm (&bitmap, &mask, xpm);
+      cursor = gdk_cursor_new_from_pixmap (bitmap, mask, &white, &black, x, y);
+      gdk_window_set_cursor (drawing_area->window, cursor);
+    }
+    else
+    {
+      cursor = gdk_cursor_new (GDK_LEFT_PTR);
+      gdk_window_set_cursor (drawing_area->window, cursor);
+      gdk_cursor_destroy (cursor);
+    }
   }
 
   ignore_commands = true;