diff --git a/polymer/eduke32/package/sdk/samples/a.m32 b/polymer/eduke32/package/sdk/samples/a.m32
index e5a908d39..5dcf9c13d 100644
--- a/polymer/eduke32/package/sdk/samples/a.m32
+++ b/polymer/eduke32/package/sdk/samples/a.m32
@@ -1540,6 +1540,18 @@ defstate moveselsects
     }
 ends
 
+defstate sanitize_underwater_sprites
+    "Xvel=1 for wall/flr spr."
+    for i selsprites
+    {
+        set j .cstat
+        and j 49
+        ife j 17 set .xvel 1
+        ife j 33 set .xvel 1
+    }
+    printmessage16 "Set xvel=1 on highlighted wall/floor sprites"
+ends
+
 // This must be *compiled* with script_expertmode
 /*
 defstate setstartpos
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 8967ad826..05d81dcb5 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -13108,7 +13108,7 @@ static void FuncMenu(void)
 
                 if (vm.flags&VMFLAG_ERROR)
                     printmessage16("There were errors while executing the menu function");
-                else
+                else if (lastpm16time != totalclock)
                     printmessage16("Menu function executed successfully");
             }