diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index 566a01be9a..d0e120ea95 100644
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -40,6 +40,7 @@ std::map<std::string,DeviceInfo> DeviceInfo::device_info;
 
 DeviceInfo::DeviceInfo()
 	: _strip_cnt (8)
+	, _extenders (0)
 	, _has_two_character_display (true)
 	, _has_master_fader (true)
 	, _has_segmented_display (false)
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index c4a37499eb..dc57b052d6 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -507,9 +507,11 @@ MackieControlProtocol::set_device (const string& device_name)
 	
 	_device_info = d->second;
 
-	surfaces.clear ();
-	create_surfaces ();
-	switch_banks (0, true);
+	if (_active) {
+		surfaces.clear ();
+		create_surfaces ();
+		switch_banks (0, true);
+	}
 }
 
 void 
diff --git a/mcp_devices/mcpro.xml b/mcp_devices/mcpro.xml
index 6b0c6dfc27..3c034be937 100644
--- a/mcp_devices/mcpro.xml
+++ b/mcp_devices/mcpro.xml
@@ -7,4 +7,5 @@
   <TimecodeDisplay value="yes"/>
   <TwoCharacterDisplay value="yes"/>
   <Extenders value="0"/>
+  <GlobalControls value="yes"/>
 </MackieProtocolDevice>
diff --git a/mcp_devices/nucleus.xml b/mcp_devices/nucleus.xml
index 6b1fdc240a..c30fb3a1de 100644
--- a/mcp_devices/nucleus.xml
+++ b/mcp_devices/nucleus.xml
@@ -7,4 +7,5 @@
   <TimecodeDisplay value="no"/>
   <TwoCharacterDisplay value="yes"/>
   <Extenders value="1"/>
+  <GlobalControls value="yes"/>
 </MackieProtocolDevice>