diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index ede9cc2074..703870ecef 100644
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -280,8 +280,10 @@ MeterStrip::MeterStrip (Session* sess, boost::shared_ptr<ARDOUR::Route> rt)
 
 MeterStrip::~MeterStrip ()
 {
-	delete level_meter;
-	CatchDeletion (this);
+	if (level_meter) {
+		delete level_meter;
+		CatchDeletion (this);
+	}
 }
 
 void
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index a0110365c1..4a4f1dd8dd 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -632,6 +632,8 @@ Meterbridge::remove_strip (MeterStrip* strip)
 			break;
 		}
 	}
+
+	resync_order();
 }
 
 void
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index c5d52f7345..60a04303a3 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -250,7 +250,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, framepos_t start, f
 		plist.add (Properties::layer, region->layer());
 		plist.add (Properties::layering_index, region->layering_index());
 
-		new_region = RegionFactory::RegionFactory::create (region, plist);
+		new_region = RegionFactory::create (region, plist);
 
 		add_region_internal (new_region, position);
 	}
diff --git a/wscript b/wscript
index d4d0cc2be4..1eec0eba5f 100644
--- a/wscript
+++ b/wscript
@@ -363,8 +363,12 @@ def set_compiler_flags (conf,opt):
 
     conf.env.append_value('CFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED')
     conf.env.append_value('CXXFLAGS', '-DBOOST_SYSTEM_NO_DEPRECATED')
+    # need ISOC9X for llabs()
+    conf.env.append_value('CFLAGS', '-D_ISOC9X_SOURCE')
     conf.env.append_value('CFLAGS', '-D_LARGEFILE64_SOURCE')
     conf.env.append_value('CFLAGS', '-D_FILE_OFFSET_BITS=64')
+    # need ISOC9X for llabs()
+    conf.env.append_value('CXXFLAGS', '-D_ISOC9X_SOURCE')
     conf.env.append_value('CXXFLAGS', '-D_LARGEFILE64_SOURCE')
     conf.env.append_value('CXXFLAGS', '-D_FILE_OFFSET_BITS=64')