diff --git a/scumm/script.cpp b/scumm/script.cpp
index 3784b35bed3..7cb994ee157 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -769,12 +769,19 @@ void Scumm::checkAndRunSentenceScript() {
 
 void Scumm::runInputScript(int a, int cmd, int mode) {
 	int args[16];
+	int verbScript;
+
+	if (_features & GF_AFTER_V2)
+		verbScript = 2;
+	else
+		verbScript = VAR(VAR_VERB_SCRIPT);
+
 	memset(args, 0, sizeof(args));
 	args[0] = a;
 	args[1] = cmd;
 	args[2] = mode;
-	if (VAR(VAR_VERB_SCRIPT))
-		runScript(VAR(VAR_VERB_SCRIPT), 0, 0, args);
+	if (verbScript)
+		runScript(verbScript, 0, 0, args);
 }
 
 void Scumm::decreaseScriptDelay(int amount) {
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 39762e65971..3d1e0a80bcd 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -1211,7 +1211,10 @@ void Scumm_v2::o2_cursorCommand() {
 	int cmd = getVarOrDirectWord(0x80);
 	int a2 = cmd >> 8;
 
-	if (a2 & 4) {warning("TODO: o2_cursorCommand(userface)");} // Toggle verbs on/off, etc
+	if (a2 & 4) {
+		_userPut = 1;
+		warning("TODO: o2_cursorCommand(userface)");
+	} // Toggle verbs on/off, etc
 
 	if (a2 & 1) {						// Freeze
 		if (a2 & 8)
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 60c53ebcdef..004abbde70f 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -78,15 +78,6 @@ void Scumm::checkExecVerbs() {
 			runInputScript(1, over != 0 ? _verbs[over].verbid : 0, code);
 		}
 	}
-
-#if 1
-		// FIXME - MM / Zak hack
-		if ((_features & GF_AFTER_V2) && (_mouseButStat & MBS_LEFT_CLICK)) {
-			printf("Running script 4\n");
-			runScript(4, 0, 0, 0);
-		}
-#endif
-
 }
 
 void Scumm::verbMouseOver(int verb) {