diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 35d5dcd2ca..3d75de782c 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -70,7 +70,7 @@ void
 Editor::add_external_audio_action (ImportMode mode_hint)
 {
 	if (session == 0) {
-		MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded."));
+		MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
 		msg.run ();
 		return;
 	}
@@ -91,7 +91,7 @@ Editor::external_audio_dialog ()
 	uint32_t track_cnt;
 
 	if (session == 0) {
-		MessageDialog msg (0, _("You can't import or embed an audiofile until you have a session loaded."));
+		MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
 		msg.run ();
 		return;
 	}
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 628df503d9..24fbe5df31 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -125,6 +125,10 @@ Editor::remove_route (TimeAxisView *tv)
 	TreeModel::Children rows = route_display_model->children();
 	TreeModel::Children::iterator ri;
 
+	if (tv == entered_track) {
+		entered_track = 0;
+	}
+
 	/* Decrement old order keys for tracks `above' the one that is being removed */
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		TimeAxisView* v = (*ri)[route_display_columns.tv];
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index f25bd9be00..0f877206f7 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -547,7 +547,7 @@ IOSelector::add_port ()
 		}
 
 		catch (AudioEngine::PortRegistrationFailure& err) {
-			MessageDialog msg (0,  _("There are no more JACK ports available."));
+			MessageDialog msg (_("There are no more JACK ports available."));
 			msg.run ();
 		}
 
@@ -558,7 +558,7 @@ IOSelector::add_port ()
 		}
 
 		catch (AudioEngine::PortRegistrationFailure& err) {
-			MessageDialog msg (0, _("There are no more JACK ports available."));
+			MessageDialog msg (_("There are no more JACK ports available."));
 			msg.run ();
 		}
 	}