diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index ec452559cd..7f5d3e5de4 100644
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -75,8 +75,6 @@ Editor::region_hidden (boost::shared_ptr<Region> r)
 void
 Editor::add_audio_regions_to_region_display (vector<boost::weak_ptr<AudioRegion> >& regions)
 {
-	cerr << "Adding " << regions.size() << " to region list\n";
-
 	region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
 	for (vector<boost::weak_ptr<AudioRegion> >::iterator x = regions.begin(); x != regions.end(); ++x) {
 		boost::shared_ptr<AudioRegion> region ((*x).lock());
@@ -360,7 +358,7 @@ Editor::region_list_display_button_press (GdkEventButton *ev)
 	int cellx;
 	int celly;
 
-	cerr << "Button press release, button = " << ev->button << endl;
+	// cerr << "Button press release, button = " << ev->button << endl;
 
 	if (region_list_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
 		if ((iter = region_list_model->get_iter (path))) {
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index d140cc159e..9998bb8994 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1145,7 +1145,13 @@ MixerStrip::map_frozen ()
 			break;
 		}
 	}
+	
+	hide_redirect_editors ();
+}
 
+void
+MixerStrip::hide_redirect_editors ()
+{
 	_route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
 }
 
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 4e06a58fab..464ec51433 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -241,6 +241,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void update_speed_display ();
 	void map_frozen ();
 	void hide_redirect_editor (boost::shared_ptr<ARDOUR::Redirect> redirect);
+	void hide_redirect_editors ();
 
 	bool ignore_speed_adjustment;
 
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index bcbb01d9c9..ab7b7c096e 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1178,11 +1178,12 @@ TempoMap::round_to_type (nframes_t frame, int dir, BBTPointType type)
 		break;
 	
 	}
-
+	
+	/* 
 	cerr << "for " << frame << " round to " << bbt << " using "
 	     << metric.start()
 	     << endl;
-
+	*/
 	return metric.frame() + count_frames_between (metric.start(), bbt);
 }
 
diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript
index 5a4dd649c7..ddeabdccdd 100644
--- a/libs/gtkmm2ext/SConscript
+++ b/libs/gtkmm2ext/SConscript
@@ -31,6 +31,9 @@ gtkmm2ext.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
 gtkmm2ext.Append(PACKAGE=domain)
 gtkmm2ext.Append(POTFILE=domain + '.pot')
 
+if gtkmm2ext['IS_OSX']:
+	gtkmm2ext.Append (LINKFLAGS="-Xlinker -headerpad -Xlinker 2048")
+	
 extra_sources = []
 
 gtkmm2ext_files = Split("""
diff --git a/svn_revision.h b/svn_revision.h
index 592c4ae9a8..6a5c0c3d02 100644
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
 #ifndef __ardour_svn_revision_h__
 #define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "3046";
+static const char* ardour_svn_revision = "3095";
 #endif