diff --git a/libs/surfaces/launch_control_xl/controllers.cc b/libs/surfaces/launch_control_xl/controllers.cc
index 94021fa481..039084a99e 100644
--- a/libs/surfaces/launch_control_xl/controllers.cc
+++ b/libs/surfaces/launch_control_xl/controllers.cc
@@ -866,7 +866,7 @@ LaunchControlXL::knob_pan(uint8_t n)
 
 	if (buttons_down.find(Device) != buttons_down.end()) { // Device button hold
 #ifdef MIXBUS
-		ac = stripable[n]->comp_threshold_controllable();
+		ac = stripable[n]->filter_freq_controllable(true);
 #else
 		ac = stripable[n]->pan_width_control();
 #endif
@@ -1096,6 +1096,10 @@ LaunchControlXL::dm_check_dummy (DeviceStatus ds)
 void
 LaunchControlXL::dm_fader (FaderID id) {
 
+	if (!first_selected_stripable()) {
+		return;
+	}
+
 	boost::shared_ptr<AutomationControl> ac;
 	boost::shared_ptr<Fader> fader;
 
diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.cc b/libs/surfaces/launch_control_xl/launch_control_xl.cc
index ac9a784d15..4e094c21f0 100644
--- a/libs/surfaces/launch_control_xl/launch_control_xl.cc
+++ b/libs/surfaces/launch_control_xl/launch_control_xl.cc
@@ -895,6 +895,7 @@ LaunchControlXL::stripable_selection_changed ()
 #endif
 		init_knobs_and_buttons();
 		init_dm_callbacks();
+		set_send_bank(0);
 	}
 }
 
@@ -1058,8 +1059,6 @@ LaunchControlXL::switch_bank (uint32_t base)
 	
 	set_send_bank(0);
 
-	set_send_bank(0);
-
 	boost::shared_ptr<SelectButton> sl = boost::dynamic_pointer_cast<SelectButton>(id_controller_button_map[SelectLeft]);
 	boost::shared_ptr<SelectButton> sr = boost::dynamic_pointer_cast<SelectButton>(id_controller_button_map[SelectRight]);