diff --git a/libs/surfaces/maschine2/callbacks.cc b/libs/surfaces/maschine2/callbacks.cc
index 27945aa05e..be4bde766a 100644
--- a/libs/surfaces/maschine2/callbacks.cc
+++ b/libs/surfaces/maschine2/callbacks.cc
@@ -55,13 +55,13 @@ Maschine2::connect_signals ()
 	tact = ActionManager::find_toggle_action (X_("Editor"), X_("ToggleMeasureVisibility"));
 	tact->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_grid_change));
 #endif
-	ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-off"));
+	ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-off"));
 	ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
 
-	ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-magnetic"));
+	ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-magnetic"));
 	ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
 
-	ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-normal"));
+	ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-normal"));
 	ract->signal_toggled ().connect (sigc::mem_fun (*this, &Maschine2::notify_snap_change));
 
 	/* Surface events */
@@ -171,9 +171,9 @@ Maschine2::notify_snap_change ()
 		return;
 	}
 
-	Glib::RefPtr<Gtk::RadioAction> ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-magnetic"));
+	Glib::RefPtr<Gtk::RadioAction> ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-magnetic"));
 	if (ract->get_active ()) { rgba = COLOR_GRAY; }
-	ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-normal"));
+	ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-normal"));
 	if (ract->get_active ()) { rgba = COLOR_WHITE; }
 
 	_ctrl->button (M2Contols::Grid)->set_color (rgba);
@@ -268,16 +268,16 @@ Maschine2::button_snap_released ()
 
 	const char* action = 0;
 
-	Glib::RefPtr<Gtk::RadioAction> ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-off"));
+	Glib::RefPtr<Gtk::RadioAction> ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-off"));
 	if (ract->get_active ()) { action = "snap-normal"; }
 
-	ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-normal"));
+	ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-normal"));
 	if (ract->get_active ()) { action = "snap-magnetic"; }
 
-	ract = ActionManager::find_radio_action (X_("Editor"), X_("snap-magnetic"));
+	ract = ActionManager::get_radio_action (X_("Editor"), X_("snap-magnetic"));
 	if (ract->get_active ()) { action = "snap-off"; }
 
-	ract = ActionManager::find_radio_action (X_("Editor"), action);
+	ract = ActionManager::get_radio_action (X_("Editor"), action);
 	ract->set_active (true);
 }
 
@@ -328,7 +328,7 @@ static void apply_ac_delta (boost::shared_ptr<AutomationControl> ac, double d) {
 	if (!ac) {
 		return;
 	}
-	ac->set_value (ac->interface_to_internal (min (ac->upper(), max (ac->lower(), ac->internal_to_interface (ac->get_value()) + d))),
+	ac->set_value (ac->interface_to_internal (std::min (ac->upper(), std::max (ac->lower(), ac->internal_to_interface (ac->get_value()) + d))),
 			PBD::Controllable::UseGroup);
 }
 
diff --git a/libs/surfaces/maschine2/maschine2.cc b/libs/surfaces/maschine2/maschine2.cc
index 6cb376c430..71163eeac4 100644
--- a/libs/surfaces/maschine2/maschine2.cc
+++ b/libs/surfaces/maschine2/maschine2.cc
@@ -83,7 +83,7 @@ class TestLayout : public Maschine2Layout
 
 			std::vector<std::string> strs;
 			strs.push_back("T|sg1");
-			strs.push_back("Test2asdjasdlkjasldkjasd");
+			strs.push_back("Test2");
 			strs.push_back("Test3");
 			strs.push_back("Test4");
 			strs.push_back("Test5");
diff --git a/libs/surfaces/maschine2/ui_knob.cc b/libs/surfaces/maschine2/ui_knob.cc
index bcb95ab89b..cbcabb1bfe 100644
--- a/libs/surfaces/maschine2/ui_knob.cc
+++ b/libs/surfaces/maschine2/ui_knob.cc
@@ -197,7 +197,7 @@ Maschine2Knob::encoder_changed (int delta)
 	}
 	const double d = delta * 0.5 / _ctrl->range ();
 	boost::shared_ptr<AutomationControl> ac = _controllable;
-	ac->set_value (ac->interface_to_internal (min (ac->upper(), max (ac->lower(), ac->internal_to_interface (ac->get_value()) + d))), PBD::Controllable::UseGroup);
+	ac->set_value (ac->interface_to_internal (std::min (ac->upper(), std::max (ac->lower(), ac->internal_to_interface (ac->get_value()) + d))), PBD::Controllable::UseGroup);
 }
 
 void
diff --git a/libs/surfaces/maschine2/wscript b/libs/surfaces/maschine2/wscript
index 5b6dc97723..b9c478faa4 100644
--- a/libs/surfaces/maschine2/wscript
+++ b/libs/surfaces/maschine2/wscript
@@ -37,7 +37,7 @@ def build(bld):
     obj.includes     = [ '.', './maschine2']
     obj.name         = 'libardour_maschine2'
     obj.target       = 'ardour_maschine2'
-    obj.uselib       = 'CAIROMM PANGOMM OSX'
+    obj.uselib       = 'CAIROMM PANGOMM XML OSX'
     obj.use          = 'libardour libardour_cp libpbd libcanvas hidapi libgtkmm2ext'
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')