diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 6b8faa025d..3164467a83 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3521,16 +3521,16 @@ ARDOUR_UI::TransportControllable::set_value (double val)
 		action = X_("Stop");
 		break;
 	case GotoStart:
-		action = X_("Goto Start");
+		action = X_("GotoStart");
 		break;
 	case GotoEnd:
-		action = X_("Goto End");
+		action = X_("GotoEnd");
 		break;
 	case AutoLoop:
 		action = X_("Loop");
 		break;
 	case PlaySelection:
-		action = X_("Play Selection");
+		action = X_("PlaySelection");
 		break;
 	case RecordEnable:
 		action = X_("Record");
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index 4be5e25b92..96d2c1772c 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -234,7 +234,9 @@ MIDIControllable::midi_sense_note (Parser &, EventTwoBytes *msg, bool /*is_on*/)
 	}
 
 	if (!controllable->is_toggle()) {
-		controllable->set_value (midi_to_control (msg->note_number));
+		if (control_additional == msg->note_number) {
+			controllable->set_value (midi_to_control (msg->velocity));
+		}
 	} else {
 		if (control_additional == msg->note_number) {
 			controllable->set_value (controllable->get_value() > 0.5f ? 0.0f : 1.0f);