diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc
index 3f41bba232..884b2b05ac 100644
--- a/gtk2_ardour/cuebox_ui.cc
+++ b/gtk2_ardour/cuebox_ui.cc
@@ -379,7 +379,7 @@ CueBoxUI::set_all_follow_action (FollowAction const & fa, uint64_t idx)
 	TriggerList tl;
 	get_slots(tl, idx);
 	for (TriggerList::iterator t = tl.begin(); t != tl.end(); ++t) {
-		(*t)->set_follow_action(fa, 0);
+		(*t)->set_follow_action0 (fa);
 		(*t)->set_follow_action_probability(0);
 	}
 }
diff --git a/gtk2_ardour/slot_properties_box.cc b/gtk2_ardour/slot_properties_box.cc
index aca9e679c4..2ffec08b9d 100644
--- a/gtk2_ardour/slot_properties_box.cc
+++ b/gtk2_ardour/slot_properties_box.cc
@@ -511,7 +511,11 @@ SlotPropertyTable::set_follow_action (FollowAction const & fa, uint64_t idx)
 		return;
 	}
 
-	trigger()->set_follow_action (fa, idx);
+	if (idx == 0) {
+		trigger()->set_follow_action0 (fa);
+	} else {
+		trigger()->set_follow_action1 (fa);
+	}
 }
 
 void
diff --git a/gtk2_ardour/trigger_ui.cc b/gtk2_ardour/trigger_ui.cc
index 169784d86b..619ba37402 100644
--- a/gtk2_ardour/trigger_ui.cc
+++ b/gtk2_ardour/trigger_ui.cc
@@ -559,7 +559,7 @@ TriggerUI::launch_context_menu ()
 	items.push_back (MenuElem (_("Quantization..."), *quant_menu));
 
 	items.push_back (CheckMenuElem (_("Cue Isolate"), sigc::mem_fun (*this, &TriggerUI::toggle_trigger_isolated)));
-	if (trigger ()->scene_isolated ()) {
+	if (trigger ()->cue_isolated ()) {
 		PBD::Unwinder<bool> uw (_ignore_menu_action, true);
 		dynamic_cast<Gtk::CheckMenuItem*> (&items.back ())->set_active (true);
 	}
@@ -616,7 +616,7 @@ TriggerUI::toggle_trigger_isolated ()
 		return;
 	}
 
-	trigger()->set_scene_isolated (!trigger()->scene_isolated ());
+	trigger()->set_cue_isolated (!trigger()->cue_isolated ());
 }
 
 void
@@ -645,7 +645,7 @@ TriggerUI::set_follow_action (FollowAction const & fa)
 		return;
 	}
 
-	trigger()->set_follow_action (fa, 0);
+	trigger()->set_follow_action0 (fa);
 	trigger()->set_follow_action_probability (0);
 }
 
diff --git a/gtk2_ardour/triggerbox_ui.cc b/gtk2_ardour/triggerbox_ui.cc
index 25372cf0be..b1c4f74866 100644
--- a/gtk2_ardour/triggerbox_ui.cc
+++ b/gtk2_ardour/triggerbox_ui.cc
@@ -432,7 +432,7 @@ TriggerEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Conte
 
 	render_children (area, context);
 
-	if (trigger ()->scene_isolated ()) {
+	if (trigger ()->cue_isolated ()) {
 		/* left shadow */
 		context->set_identity_matrix ();
 		context->translate (self.x0, self.y0 - 0.5);