diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index 5714cc298..f87a77a14 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -3604,6 +3604,8 @@ void overheadeditor(void)
 
                 if ((pointhighlight&16384)==0)
                 {
+                    // If aiming at wall, check whether it is corrupt, and print a
+                    // warning message near the mouse pointer if that is the case.
                     for (i=0; i<numcorruptthings; i++)
                         if ((corruptthings[i]&CORRUPT_MASK)==CORRUPT_WALL &&
                             (corruptthings[i]&(MAXWALLS-1))==pointhighlight)
@@ -7982,18 +7984,18 @@ static void SaveBoardAndPrintMessage(const char *fn)
     if (f)
     {
         if (saveboard_fixedsprites)
-            printmessage16("Saved board %sto %s (changed sectnums of %d sprites).",
-                           saveboard_savedtags?"and tags ":"", f, saveboard_fixedsprites);
+            message("Saved board %sto %s (changed sectnums of %d sprites).",
+                    saveboard_savedtags?"and tags ":"", f, saveboard_fixedsprites);
         else
-            printmessage16("Saved board %sto %s.", saveboard_savedtags?"and tags ":"", f);
+            message("Saved board %sto %s.", saveboard_savedtags?"and tags ":"", f);
     }
     else
     {
         if (saveboard_fixedsprites)
-            printmessage16("Saving board failed (changed sectnums of %d sprites).",
-                           saveboard_fixedsprites);
+            message("^13SAVING BOARD FAILED (changed sectnums of %d sprites).",
+                    saveboard_fixedsprites);
         else
-            printmessage16("Saving board failed.");
+            message("^13SAVING BOARD FAILED.");
     }
 }
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 85cd4f813..eadef6944 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -4982,7 +4982,7 @@ static void Keys3d(void)
         {
             while (num < 4)
                 lines[num++][0] = 0;
-            Bsprintf(lines[num++],"^251%s",getmessage);
+            Bsprintf(lines[num++], "^251%s", getmessage);
         }
 
         begindrawing();
@@ -8070,7 +8070,9 @@ static void Keys2d(void)
                 {
                 case 0:
                     printmessage16("MAP LIMITS EXCEEDED!");
-                    x = y = z = 0;
+                    /* fall-through */
+                default:
+                    k = 0;
                     break;
                 case CORRUPT_SECTOR:
                     i = k&(MAXSECTORS-1);
@@ -8093,10 +8095,6 @@ static void Keys2d(void)
                     y = sprite[i].y;
                     z = sprite[i].z;
                     break;
-                default:
-                    k = 0;
-                    x = y = z = 0;
-                    break;
                 }
 
                 if (k)
@@ -11320,10 +11318,10 @@ void ExtCheckKeys(void)
 { \
     bad = max(bad, errlev); \
     if (numcorruptthings>=MAXCORRUPTTHINGS) \
-    goto too_many_errors; \
+        goto too_many_errors; \
     corruptthings[numcorruptthings++] = (what); \
     if (errlev >= printfromlev) \
-    OSD_Printf_nowarn("#%d: " fmt "\n", numcorruptthings, ## __VA_ARGS__); \
+        OSD_Printf_nowarn("#%d: " fmt "\n", numcorruptthings, ## __VA_ARGS__); \
 } while (0)
 #endif
 #ifdef YAX_ENABLE