diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 3ff625a207..02b1efaa2e 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -106,6 +106,7 @@ ARDOUR_UI::set_session (Session *s)
 	big_clock->set_session (s);
 	time_info_box->set_session (s);
 	video_timeline->set_session (s);
+	location_ui->set_session (s);
 
 	/* sensitize menu bar options that are now valid */
 
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index b3ce711c45..2929d5cb2b 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -333,7 +333,7 @@ GainMeterBase::reset_peak_display ()
 	_meter->reset_max();
 	level_meter->clear_meters();
 	max_peak = -INFINITY;
-	peak_display.set_label (_("-Inf"));
+	peak_display.set_label (_("-inf"));
 	peak_display.set_name ("MixerStripPeakDisplay");
 }
 
@@ -1163,7 +1163,8 @@ GainMeter::meter_configuration_changed (ChanCount c)
 		}
 	}
 
-	if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
+	if (_route
+			&& boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
 			&& boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
 			) {
 		if (_route->active()) {
@@ -1173,20 +1174,20 @@ GainMeter::meter_configuration_changed (ChanCount c)
 		}
 	}
 	else if (type == (1 << DataType::AUDIO)) {
-		if (_route->active()) {
+		if (!_route || _route->active()) {
 			set_meter_strip_name ("AudioTrackMetrics");
 		} else {
 			set_meter_strip_name ("AudioTrackMetricsInactive");
 		}
 	}
 	else if (type == (1 << DataType::MIDI)) {
-		if (_route->active()) {
+		if (!_route || _route->active()) {
 			set_meter_strip_name ("MidiTrackMetrics");
 		} else {
 			set_meter_strip_name ("MidiTrackMetricsInactive");
 		}
 	} else {
-		if (_route->active()) {
+		if (!_route || _route->active()) {
 			set_meter_strip_name ("AudioMidiTrackMetrics");
 		} else {
 			set_meter_strip_name ("AudioMidiTrackMetricsInactive");
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 30a5b62426..9b9f3bfa22 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -1162,6 +1162,7 @@ LocationUIWindow::set_session (Session *s)
 {
 	ArdourWindow::set_session (s);
 	_ui.set_session (s);
+	_ui.show_all ();
 }
 
 void