diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index e79b03ef57..a5310c76b7 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -280,7 +280,8 @@ Editor::Editor ()
 	verbose_cursor_on = true;
 	route_removal = false;
 	show_automatic_regions_in_region_list = true;
-	region_list_sort_type = (Editing::RegionListSortType) 0; 
+
+	region_list_sort_type = (Editing::RegionListSortType) 0;
 	have_pending_keyboard_selection = false;
 	_follow_playhead = true;
 	_xfade_visibility = true;
@@ -2595,8 +2596,11 @@ Editor::setup_toolbar ()
 {
 	string pixmap_path;
 
+#ifdef GTKOSX
+	const guint32 FUDGE = 38; // Combo's are stupid - they steal space from the entry for the button
+#else
 	const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button
-
+#endif
 
 	/* Mode Buttons (tool selection) */
 
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index f65f482027..2ea5074de7 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -43,7 +43,7 @@ guint Keyboard::delete_but = 3;
 guint Keyboard::delete_mod = GDK_SHIFT_MASK;
 guint Keyboard::snap_mod = GDK_MOD3_MASK;
 
-#ifdef NATIVE_OSX_KEYS
+#ifdef GTKOSX
 guint Keyboard::PrimaryModifier = GDK_MOD1_MASK;   // Command
 guint Keyboard::SecondaryModifier = GDK_MOD5_MASK; // Alt/Option
 guint Keyboard::TertiaryModifier = GDK_SHIFT_MASK; // Shift