diff --git a/mps/code/airtest.c b/mps/code/airtest.c
index 2e878cb20c8..ec01bbabc8d 100644
--- a/mps/code/airtest.c
+++ b/mps/code/airtest.c
@@ -25,14 +25,14 @@ void test_main(void)
     mps_addr_t ref = obj;
     mps_finalize(scheme_arena, &ref);
     s[j] = obj->string.string;
-    sprintf(s[j], "%lu", (unsigned long)j);
-    ++ s[j];
+    *s[j]++ = '0' + (char)j;
+    *s[j] = '\0';
   }
   mps_message_type_enable(scheme_arena, mps_message_type_finalization());
   for (i = 0; i + 3 < size; ++i) {
     mps_message_t msg;
     for (j = 0; j < 10; ++j) {
-      *s[j]++ = '0';
+      *s[j]++ = '.';
       *s[j] = '\0';
     }
     mps_arena_collect(scheme_arena);
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk
index d796462a119..06a60594c45 100644
--- a/mps/code/commpre.nmk
+++ b/mps/code/commpre.nmk
@@ -14,24 +14,25 @@
 # %%PART: When adding a new part, add a new parameter for the files included
 # in the part
 # Parameters:
-#   PFM      platform code, e.g. "w3i3mv"
-#   PFMDEFS  /D options to define platforms preprocessor symbols
-#            to the compiler.  Eg "/DOS_NT /DARCH_386 /DBUILD_MVC"
+#   PFM        platform code, e.g. "w3i3mv"
+#   PFMDEFS    /D options to define platforms preprocessor symbols
+#              to the compiler.  Eg "/DOS_NT /DARCH_386 /DBUILD_MVC"
 #   MPMCOMMON  list of sources which make up the "mpm" part for all
-#            platforms.  Each source is stripped of its .c extension
-#            and surrounded in angle brackets (<>)
-#   MPM      as above, plus sources for the "mpm" part for the current
-#            platform.
-#   PLINTH   as above for the "plinth" part
-#   AMC      as above for the "amc" part
-#   AMS      as above for the "ams" part
-#   LO       as above for the "lo" part
-#   POOLN    as above for the "pooln" part
-#   SNC      as above for the "snc" part
-#   DW       as above for the "dw" part
-#   FMTTEST  as above for the "fmttest" part
-#   TESTLIB  as above for the "testlib" part
-#   NOISY    if defined, causes command to be emitted
+#              platforms.  Each source is stripped of its .c extension
+#              and surrounded in angle brackets (<>)
+#   MPM        as above, plus sources for the "mpm" part for the current
+#              platform.
+#   PLINTH     as above for the "plinth" part
+#   AMC        as above for the "amc" part
+#   AMS        as above for the "ams" part
+#   LO         as above for the "lo" part
+#   POOLN      as above for the "pooln" part
+#   SNC        as above for the "snc" part
+#   DW         as above for the "dw" part
+#   FMTTEST    as above for the "fmttest" part
+#   FMTSCHEME  as above for the "fmtscheme" part
+#   TESTLIB    as above for the "testlib" part
+#   NOISY      if defined, causes command to be emitted
 #
 #
 # EDITING
@@ -138,6 +139,24 @@ TESTLIB = <testlib>
 !IFNDEF AMS
 !ERROR commpre.nmk: AMS not defined
 !ENDIF
+!IFNDEF POOLN
+!ERROR commpre.nmk: POOLN not defined
+!ENDIF
+!IFNDEF SNC
+!ERROR commpre.nmk: SNC not defined
+!ENDIF
+!IFNDEF DW
+!ERROR commpre.nmk: DW not defined
+!ENDIF
+!IFNDEF FMTTEST
+!ERROR commpre.nmk: FMTTEST not defined
+!ENDIF
+!IFNDEF FMTSCHEME
+!ERROR commpre.nmk: FMTSCHEME not defined
+!ENDIF
+!IFNDEF TESTLIB
+!ERROR commpre.nmk: TESTLIB not defined
+!ENDIF
 !IFNDEF TESTLIB
 !ERROR commpre.nmk: TESTLIB not defined
 !ENDIF
diff --git a/mps/code/nailboard.c b/mps/code/nailboard.c
index 05f8d5f97a1..82ff8479855 100644
--- a/mps/code/nailboard.c
+++ b/mps/code/nailboard.c
@@ -82,7 +82,7 @@ void NailboardDestroy(Nailboard board)
 
 Align NailboardAlignment(Nailboard board)
 {
-  return 1 << board->markShift;
+    return (Align)1 << board->markShift;
 }
 
 /* nailboardIndex -- return the index of the nail corresponding to addr */
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 9bea83c3a25..aa4bb064dd8 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -44,6 +44,7 @@ SNCOBJ0 = $(SNC:<=w3i3mv\hot\)
 MVFFOBJ0 = $(MVFF:<=w3i3mv\hot\)
 DWOBJ0 = $(DW:<=w3i3mv\hot\)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hot\)
+FMTSCHEMEOBJ0 = $(FMTSCHEME:<=w3i3mv\hot\)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\hot\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hot\)
 
@@ -62,6 +63,7 @@ SNCOBJ0 = $(SNC:<=w3i3mv\cool\)
 MVFFOBJ0 = $(MVFF:<=w3i3mv\cool\)
 DWOBJ0 = $(DW:<=w3i3mv\cool\)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\cool\)
+FMTSCHEMEOBJ0 = $(FMTSCHEME:<=w3i3mv\cool\)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\cool\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cool\)
 
@@ -80,6 +82,7 @@ SNCOBJ0 = $(SNC:<=w3i3mv\rash\)
 MVFFOBJ0 = $(MVFF:<=w3i3mv\rash\)
 DWOBJ0 = $(DW:<=w3i3mv\rash\)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\rash\)
+FMTSCHEMEOBJ0 = $(FMTSCHEME:<=w3i3mv\rash\)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\rash\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\rash\)
 
@@ -123,6 +126,7 @@ SNCOBJ = $(SNCOBJ0:>=.obj)
 MVFFOBJ = $(MVFFOBJ0:>=.obj)
 DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+FMTSCHEMEOBJ = $(FMTSCHEMEOBJ0:>=.obj)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index 2a4769a665f..0f0399a079e 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -45,6 +45,7 @@ SNCOBJ0 = $(SNC:<=w3i6mv\hot\)
 MVFFOBJ0 = $(MVFF:<=w3i6mv\hot\)
 DWOBJ0 = $(DW:<=w3i6mv\hot\)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\hot\)
+FMTSCHEMEOBJ0 = $(FMTSCHEME:<=w3i6mv\hot\)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\hot\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\hot\)
 
@@ -63,6 +64,7 @@ SNCOBJ0 = $(SNC:<=w3i6mv\cool\)
 MVFFOBJ0 = $(MVFF:<=w3i6mv\cool\)
 DWOBJ0 = $(DW:<=w3i6mv\cool\)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\cool\)
+FMTSCHEMEOBJ0 = $(FMTSCHEME:<=w3i6mv\cool\)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\cool\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\cool\)
 
@@ -81,6 +83,7 @@ SNCOBJ0 = $(SNC:<=w3i6mv\rash\)
 MVFFOBJ0 = $(MVFF:<=w3i6mv\rash\)
 DWOBJ0 = $(DW:<=w3i6mv\rash\)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\rash\)
+FMTSCHEMEOBJ0 = $(FMTSCHEME:<=w3i6mv\rash\)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\rash\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\rash\)
 
@@ -124,6 +127,7 @@ SNCOBJ = $(SNCOBJ0:>=.obj)
 MVFFOBJ = $(MVFFOBJ0:>=.obj)
 DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+FMTSCHEMEOBJ = $(FMTSCHEMEOBJ0:>=.obj)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)