diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index fabece03fb..33c1a0b6eb 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -230,7 +230,7 @@ ARDOUR_UI::install_actions ()
 	act = ActionManager::register_action (main_actions, X_("Close"), _("Close"),  sigc::mem_fun(*this, &ARDOUR_UI::close_session));
 	ActionManager::session_sensitive_actions.push_back (act);
 
-	act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track or Bus..."),
+	act = ActionManager::register_action (main_actions, X_("AddTrackBus"), _("Add Track"),
 					      sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::add_route), (Gtk::Window*) 0));
 	ActionManager::session_sensitive_actions.push_back (act);
 	ActionManager::write_sensitive_actions.push_back (act);
@@ -589,17 +589,6 @@ ARDOUR_UI::build_menu_bar ()
 #else
 	use_menubar_as_top_menubar ();
 #endif
-
-	bool wall_clock = false;
-	bool disk_space = false;
-
- 	if (!Profile->get_small_screen()) {
-#ifndef GTKOSX
-		// OSX provides its own wallclock, thank you very much
-		wall_clock = true;
-#endif
-		disk_space = true;
-	}
 	
 	menu_hbox.pack_end (*ev, false, false, 6);
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e37b9dcd60..6901f96123 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -205,20 +205,10 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
         Gdk::Color color;
         Editor* editor = dynamic_cast<Editor*>( &(ARDOUR_UI::instance()->the_editor()) );
         
-        if( editor!=NULL && editor->set_session_in_progress() )
-        {
-            if( _route->is_master() )
-                color = (Gdk::Color)(MixerStrip::XMLColor[master_color]);
-            else
-                color = MixerStrip::palette_random_color();
-        }
-        else
-		{
-			if( _route->is_master() )
-                color = (Gdk::Color)(MixerStrip::XMLColor[master_color]);
-			else
-				color = (Gdk::Color)(MixerStrip::XMLColor[default_palette_color]);
-		}
+		if ( _route->is_master() )
+            color = (Gdk::Color)(MixerStrip::XMLColor[master_color]);
+		else
+		    color = (Gdk::Color)(MixerStrip::XMLColor[default_palette_color]);
 
         set_color (color);
 	}
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 1053916642..e202cd680e 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -61,9 +61,9 @@ using namespace Gtkmm2ext;
 
 // GZ: Should be moved to config
 #ifdef _WIN32
-    Pango::FontDescription TimeAxisViewItem::NAME_FONT("Helvetica 8");
-#else
     Pango::FontDescription TimeAxisViewItem::NAME_FONT("Arial 8");
+#else
+    Pango::FontDescription TimeAxisViewItem::NAME_FONT("Helvetica 8");
 #endif
 
 const double TimeAxisViewItem::NAME_HIGHLIGHT_Y_INDENT = 1.0;
diff --git a/gtk2_ardour/tracks_control_panel.logic.cc b/gtk2_ardour/tracks_control_panel.logic.cc
index 1e7e94845d..e5a27f70e8 100644
--- a/gtk2_ardour/tracks_control_panel.logic.cc
+++ b/gtk2_ardour/tracks_control_panel.logic.cc
@@ -1636,8 +1636,31 @@ TracksControlPanel::bufsize_as_string (uint32_t sz)
 framecnt_t
 TracksControlPanel::get_sample_rate () const
 {
-	float r = atof (_sample_rate_combo.get_active_text ());
-	/* the string may have been translated with an abbreviation for
+    const string sample_rate = _sample_rate_combo.get_active_text ();
+    
+    if ( "44.1 kHz" == sample_rate )
+    {
+        return 44100;
+    } else if ( "48 kHz" == sample_rate )
+    {
+        return 48000;
+    } else if ( "88.2 kHz" == sample_rate )
+    {
+        return 88200;
+    } else if ( "96 kHz" == sample_rate )
+    {
+        return 96000;
+    } else if ( "172.4 kHz" == sample_rate )
+    {
+        return 172400;
+    } else if ( "192 kHz" == sample_rate )
+    {
+        return 192000;
+    }
+    
+    float r = atof (sample_rate);
+	    
+    /* the string may have been translated with an abbreviation for
 	* thousands, so use a crude heuristic to fix this.
 	*/
 	if (r < 1000.0) {