diff --git a/bootstrap/unix-44/Compiler.c b/bootstrap/unix-44/Compiler.c
index e59d7615..9322477d 100644
--- a/bootstrap/unix-44/Compiler.c
+++ b/bootstrap/unix-44/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Configuration.c b/bootstrap/unix-44/Configuration.c
index 01281cfc..f30fe61f 100644
--- a/bootstrap/unix-44/Configuration.c
+++ b/bootstrap/unix-44/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/Configuration.h b/bootstrap/unix-44/Configuration.h
index 98f85767..39dd27b9 100644
--- a/bootstrap/unix-44/Configuration.h
+++ b/bootstrap/unix-44/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-44/Files.c b/bootstrap/unix-44/Files.c
index f39534fc..96dd911c 100644
--- a/bootstrap/unix-44/Files.c
+++ b/bootstrap/unix-44/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Files.h b/bootstrap/unix-44/Files.h
index e124b950..c97d14a6 100644
--- a/bootstrap/unix-44/Files.h
+++ b/bootstrap/unix-44/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-44/Heap.c b/bootstrap/unix-44/Heap.c
index b6abc8f3..95b746d7 100644
--- a/bootstrap/unix-44/Heap.c
+++ b/bootstrap/unix-44/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Heap.h b/bootstrap/unix-44/Heap.h
index 82ebd04d..86033649 100644
--- a/bootstrap/unix-44/Heap.h
+++ b/bootstrap/unix-44/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-44/Modules.c b/bootstrap/unix-44/Modules.c
index 0290d664..73c918d9 100644
--- a/bootstrap/unix-44/Modules.c
+++ b/bootstrap/unix-44/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Modules.h b/bootstrap/unix-44/Modules.h
index 3ab94701..92ebb074 100644
--- a/bootstrap/unix-44/Modules.h
+++ b/bootstrap/unix-44/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-44/OPB.c b/bootstrap/unix-44/OPB.c
index d9e826b8..57fde3a0 100644
--- a/bootstrap/unix-44/OPB.c
+++ b/bootstrap/unix-44/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -550,7 +550,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0xf0, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = -z->conval->intval;
@@ -577,7 +577,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0x70, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = __ABS(z->conval->intval);
@@ -920,7 +920,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			if (f == 4) {
 				xv = xval->intval;
 				yv = yval->intval;
-				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) {
+				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807LL, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807LL-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807LL-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807LL-1))) && yv != (-9223372036854775807LL-1))) && -xv <= __DIV(9223372036854775807LL, -yv))) {
 					xval->intval = xv * yv;
 					OPB_SetIntType(x);
 				} else {
@@ -999,8 +999,8 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 6: 
 			if (f == 4) {
-				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval);
-				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) {
+				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807LL - yval->intval);
+				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807LL-1) - yval->intval)) {
 					xval->intval += yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -1023,7 +1023,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 7: 
 			if (f == 4) {
-				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) {
+				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807LL-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807LL + yval->intval)) {
 					xval->intval -= yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -2087,7 +2087,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, INT8 fctno)
 						OPB_err(208);
 						p->conval->intval = 1;
 					} else if (x->conval->intval >= 0) {
-						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807, (INT64)__ASH(1, x->conval->intval))) {
+						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807LL, (INT64)__ASH(1, x->conval->intval))) {
 							p->conval->intval = p->conval->intval * (INT64)__ASH(1, x->conval->intval);
 						} else {
 							OPB_err(208);
@@ -2585,7 +2585,7 @@ export void *OPB__init(void)
 	__MODULE_IMPORT(OPT);
 	__REGMOD("OPB", 0);
 /* BEGIN */
-	OPB_maxExp = OPB_log(4611686018427387904);
+	OPB_maxExp = OPB_log(4611686018427387904LL);
 	OPB_maxExp = OPB_exp;
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-44/OPB.h b/bootstrap/unix-44/OPB.h
index 2c396170..e841f317 100644
--- a/bootstrap/unix-44/OPB.h
+++ b/bootstrap/unix-44/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-44/OPC.c b/bootstrap/unix-44/OPC.c
index 5f4dc826..73872a51 100644
--- a/bootstrap/unix-44/OPC.c
+++ b/bootstrap/unix-44/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPC.h b/bootstrap/unix-44/OPC.h
index f9bc06a4..06fa9996 100644
--- a/bootstrap/unix-44/OPC.h
+++ b/bootstrap/unix-44/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-44/OPM.c b/bootstrap/unix-44/OPM.c
index 1732c950..9aca428d 100644
--- a/bootstrap/unix-44/OPM.c
+++ b/bootstrap/unix-44/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -893,7 +893,7 @@ void OPM_WriteHex (INT64 i)
 
 void OPM_WriteInt (INT64 i)
 {
-	CHAR s[24];
+	CHAR s[26];
 	INT64 i1, k;
 	if ((i == OPM_SignedMinimum(2) || i == OPM_SignedMinimum(4)) || i == OPM_SignedMinimum(8)) {
 		OPM_Write('(');
@@ -901,21 +901,27 @@ void OPM_WriteInt (INT64 i)
 		OPM_WriteString((CHAR*)"-1)", 4);
 	} else {
 		i1 = __ABS(i);
-		s[0] = (CHAR)(__MOD(i1, 10) + 48);
+		if (i1 <= 2147483647) {
+			k = 0;
+		} else {
+			__MOVE("LL", s, 3);
+			k = 2;
+		}
+		s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 		i1 = __DIV(i1, 10);
-		k = 1;
+		k += 1;
 		while (i1 > 0) {
-			s[__X(k, 24)] = (CHAR)(__MOD(i1, 10) + 48);
+			s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 			i1 = __DIV(i1, 10);
 			k += 1;
 		}
 		if (i < 0) {
-			s[__X(k, 24)] = '-';
+			s[__X(k, 26)] = '-';
 			k += 1;
 		}
 		while (k > 0) {
 			k -= 1;
-			OPM_Write(s[__X(k, 24)]);
+			OPM_Write(s[__X(k, 26)]);
 		}
 	}
 }
diff --git a/bootstrap/unix-44/OPM.h b/bootstrap/unix-44/OPM.h
index 979995c8..6ea722dc 100644
--- a/bootstrap/unix-44/OPM.h
+++ b/bootstrap/unix-44/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-44/OPP.c b/bootstrap/unix-44/OPP.c
index 69624c1f..24a04912 100644
--- a/bootstrap/unix-44/OPP.c
+++ b/bootstrap/unix-44/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPP.h b/bootstrap/unix-44/OPP.h
index b748e221..b6d59055 100644
--- a/bootstrap/unix-44/OPP.h
+++ b/bootstrap/unix-44/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-44/OPS.c b/bootstrap/unix-44/OPS.c
index eee78d80..311cbe15 100644
--- a/bootstrap/unix-44/OPS.c
+++ b/bootstrap/unix-44/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -198,7 +198,7 @@ static void OPS_Number (void)
 				while (i < n) {
 					d = Ord__7(dig[i], 0);
 					i += 1;
-					if (OPS_intval <= __DIV(9223372036854775807 - (INT64)d, 10)) {
+					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
 					} else {
 						OPS_err(203);
diff --git a/bootstrap/unix-44/OPS.h b/bootstrap/unix-44/OPS.h
index 7ab70899..28618fe1 100644
--- a/bootstrap/unix-44/OPS.h
+++ b/bootstrap/unix-44/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-44/OPT.c b/bootstrap/unix-44/OPT.c
index 40f61458..dcaf0156 100644
--- a/bootstrap/unix-44/OPT.c
+++ b/bootstrap/unix-44/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPT.h b/bootstrap/unix-44/OPT.h
index 67996e8e..ab443dff 100644
--- a/bootstrap/unix-44/OPT.h
+++ b/bootstrap/unix-44/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-44/OPV.c b/bootstrap/unix-44/OPV.c
index fb6ac690..5a44f258 100644
--- a/bootstrap/unix-44/OPV.c
+++ b/bootstrap/unix-44/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/OPV.h b/bootstrap/unix-44/OPV.h
index 43aaf24a..d26a1b3e 100644
--- a/bootstrap/unix-44/OPV.h
+++ b/bootstrap/unix-44/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-44/Out.c b/bootstrap/unix-44/Out.c
index a03cf592..73f0311a 100644
--- a/bootstrap/unix-44/Out.c
+++ b/bootstrap/unix-44/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -89,7 +89,7 @@ void Out_Int (INT64 x, INT64 n)
 	INT16 i;
 	BOOLEAN negative;
 	negative = x < 0;
-	if (x == (-9223372036854775807-1)) {
+	if (x == (-9223372036854775807LL-1)) {
 		__MOVE("8085774586302733229", s, 20);
 		i = 19;
 	} else {
@@ -175,7 +175,7 @@ static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_)
 	INT64 m;
 	INT16 d, dr;
 	e = (INT16)__MASK(__ASHR((__VAL(INT64, x)), 52), -2048);
-	f = __MASK((__VAL(INT64, x)), -4503599627370496);
+	f = __MASK((__VAL(INT64, x)), -4503599627370496LL);
 	nn = (__VAL(INT64, x) < 0 && !((e == 2047 && f != 0)));
 	if (nn) {
 		n -= 1;
diff --git a/bootstrap/unix-44/Out.h b/bootstrap/unix-44/Out.h
index 27f2c9bb..a4eb7cb6 100644
--- a/bootstrap/unix-44/Out.h
+++ b/bootstrap/unix-44/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-44/Platform.c b/bootstrap/unix-44/Platform.c
index 1fc766bf..95c8d97b 100644
--- a/bootstrap/unix-44/Platform.c
+++ b/bootstrap/unix-44/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Platform.h b/bootstrap/unix-44/Platform.h
index 9be32cda..1f183fc5 100644
--- a/bootstrap/unix-44/Platform.h
+++ b/bootstrap/unix-44/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-44/Reals.c b/bootstrap/unix-44/Reals.c
index e4149017..33c286b7 100644
--- a/bootstrap/unix-44/Reals.c
+++ b/bootstrap/unix-44/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Reals.h b/bootstrap/unix-44/Reals.h
index e3bfadb5..6fc2dd5c 100644
--- a/bootstrap/unix-44/Reals.h
+++ b/bootstrap/unix-44/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-44/Strings.c b/bootstrap/unix-44/Strings.c
index a3f1e808..42190367 100644
--- a/bootstrap/unix-44/Strings.c
+++ b/bootstrap/unix-44/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/Strings.h b/bootstrap/unix-44/Strings.h
index b192b7bb..1806a7cc 100644
--- a/bootstrap/unix-44/Strings.h
+++ b/bootstrap/unix-44/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-44/Texts.c b/bootstrap/unix-44/Texts.c
index 376db061..489acce0 100644
--- a/bootstrap/unix-44/Texts.c
+++ b/bootstrap/unix-44/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -1046,7 +1046,7 @@ void Texts_WriteInt (Texts_Writer *W, ADDRESS *W__typ, INT64 x, INT64 n)
 	CHAR a[24];
 	i = 0;
 	if (x < 0) {
-		if (x == (-9223372036854775807-1)) {
+		if (x == (-9223372036854775807LL-1)) {
 			Texts_WriteString(&*W, W__typ, (CHAR*)" -9223372036854775808", 22);
 			return;
 		} else {
diff --git a/bootstrap/unix-44/Texts.h b/bootstrap/unix-44/Texts.h
index 4ea56de1..00add2ac 100644
--- a/bootstrap/unix-44/Texts.h
+++ b/bootstrap/unix-44/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-44/VT100.c b/bootstrap/unix-44/VT100.c
index 7a2a840d..c6c421f9 100644
--- a/bootstrap/unix-44/VT100.c
+++ b/bootstrap/unix-44/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-44/VT100.h b/bootstrap/unix-44/VT100.h
index 5a3fe6d0..b1771722 100644
--- a/bootstrap/unix-44/VT100.h
+++ b/bootstrap/unix-44/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c
index 657534b4..e89705a7 100644
--- a/bootstrap/unix-44/extTools.c
+++ b/bootstrap/unix-44/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
 
 static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
-	__COPY("gcc -g", s, s__len);
+	__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
 	Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
 	Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
@@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
 	Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
 	if (statically) {
-		Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
+		Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	}
 	Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
 	Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
diff --git a/bootstrap/unix-44/extTools.h b/bootstrap/unix-44/extTools.h
index 6ad7abb0..e92a4c5f 100644
--- a/bootstrap/unix-44/extTools.h
+++ b/bootstrap/unix-44/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-48/Compiler.c b/bootstrap/unix-48/Compiler.c
index e59d7615..9322477d 100644
--- a/bootstrap/unix-48/Compiler.c
+++ b/bootstrap/unix-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Configuration.c b/bootstrap/unix-48/Configuration.c
index 01281cfc..f30fe61f 100644
--- a/bootstrap/unix-48/Configuration.c
+++ b/bootstrap/unix-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/Configuration.h b/bootstrap/unix-48/Configuration.h
index 98f85767..39dd27b9 100644
--- a/bootstrap/unix-48/Configuration.h
+++ b/bootstrap/unix-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-48/Files.c b/bootstrap/unix-48/Files.c
index f39534fc..96dd911c 100644
--- a/bootstrap/unix-48/Files.c
+++ b/bootstrap/unix-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Files.h b/bootstrap/unix-48/Files.h
index e124b950..c97d14a6 100644
--- a/bootstrap/unix-48/Files.h
+++ b/bootstrap/unix-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-48/Heap.c b/bootstrap/unix-48/Heap.c
index b6abc8f3..95b746d7 100644
--- a/bootstrap/unix-48/Heap.c
+++ b/bootstrap/unix-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Heap.h b/bootstrap/unix-48/Heap.h
index 82ebd04d..86033649 100644
--- a/bootstrap/unix-48/Heap.h
+++ b/bootstrap/unix-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-48/Modules.c b/bootstrap/unix-48/Modules.c
index 0290d664..73c918d9 100644
--- a/bootstrap/unix-48/Modules.c
+++ b/bootstrap/unix-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Modules.h b/bootstrap/unix-48/Modules.h
index 3ab94701..92ebb074 100644
--- a/bootstrap/unix-48/Modules.h
+++ b/bootstrap/unix-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-48/OPB.c b/bootstrap/unix-48/OPB.c
index d9e826b8..57fde3a0 100644
--- a/bootstrap/unix-48/OPB.c
+++ b/bootstrap/unix-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -550,7 +550,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0xf0, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = -z->conval->intval;
@@ -577,7 +577,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0x70, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = __ABS(z->conval->intval);
@@ -920,7 +920,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			if (f == 4) {
 				xv = xval->intval;
 				yv = yval->intval;
-				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) {
+				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807LL, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807LL-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807LL-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807LL-1))) && yv != (-9223372036854775807LL-1))) && -xv <= __DIV(9223372036854775807LL, -yv))) {
 					xval->intval = xv * yv;
 					OPB_SetIntType(x);
 				} else {
@@ -999,8 +999,8 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 6: 
 			if (f == 4) {
-				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval);
-				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) {
+				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807LL - yval->intval);
+				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807LL-1) - yval->intval)) {
 					xval->intval += yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -1023,7 +1023,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 7: 
 			if (f == 4) {
-				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) {
+				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807LL-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807LL + yval->intval)) {
 					xval->intval -= yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -2087,7 +2087,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, INT8 fctno)
 						OPB_err(208);
 						p->conval->intval = 1;
 					} else if (x->conval->intval >= 0) {
-						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807, (INT64)__ASH(1, x->conval->intval))) {
+						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807LL, (INT64)__ASH(1, x->conval->intval))) {
 							p->conval->intval = p->conval->intval * (INT64)__ASH(1, x->conval->intval);
 						} else {
 							OPB_err(208);
@@ -2585,7 +2585,7 @@ export void *OPB__init(void)
 	__MODULE_IMPORT(OPT);
 	__REGMOD("OPB", 0);
 /* BEGIN */
-	OPB_maxExp = OPB_log(4611686018427387904);
+	OPB_maxExp = OPB_log(4611686018427387904LL);
 	OPB_maxExp = OPB_exp;
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-48/OPB.h b/bootstrap/unix-48/OPB.h
index 2c396170..e841f317 100644
--- a/bootstrap/unix-48/OPB.h
+++ b/bootstrap/unix-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-48/OPC.c b/bootstrap/unix-48/OPC.c
index 5f4dc826..73872a51 100644
--- a/bootstrap/unix-48/OPC.c
+++ b/bootstrap/unix-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPC.h b/bootstrap/unix-48/OPC.h
index f9bc06a4..06fa9996 100644
--- a/bootstrap/unix-48/OPC.h
+++ b/bootstrap/unix-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-48/OPM.c b/bootstrap/unix-48/OPM.c
index 1732c950..9aca428d 100644
--- a/bootstrap/unix-48/OPM.c
+++ b/bootstrap/unix-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -893,7 +893,7 @@ void OPM_WriteHex (INT64 i)
 
 void OPM_WriteInt (INT64 i)
 {
-	CHAR s[24];
+	CHAR s[26];
 	INT64 i1, k;
 	if ((i == OPM_SignedMinimum(2) || i == OPM_SignedMinimum(4)) || i == OPM_SignedMinimum(8)) {
 		OPM_Write('(');
@@ -901,21 +901,27 @@ void OPM_WriteInt (INT64 i)
 		OPM_WriteString((CHAR*)"-1)", 4);
 	} else {
 		i1 = __ABS(i);
-		s[0] = (CHAR)(__MOD(i1, 10) + 48);
+		if (i1 <= 2147483647) {
+			k = 0;
+		} else {
+			__MOVE("LL", s, 3);
+			k = 2;
+		}
+		s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 		i1 = __DIV(i1, 10);
-		k = 1;
+		k += 1;
 		while (i1 > 0) {
-			s[__X(k, 24)] = (CHAR)(__MOD(i1, 10) + 48);
+			s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 			i1 = __DIV(i1, 10);
 			k += 1;
 		}
 		if (i < 0) {
-			s[__X(k, 24)] = '-';
+			s[__X(k, 26)] = '-';
 			k += 1;
 		}
 		while (k > 0) {
 			k -= 1;
-			OPM_Write(s[__X(k, 24)]);
+			OPM_Write(s[__X(k, 26)]);
 		}
 	}
 }
diff --git a/bootstrap/unix-48/OPM.h b/bootstrap/unix-48/OPM.h
index 979995c8..6ea722dc 100644
--- a/bootstrap/unix-48/OPM.h
+++ b/bootstrap/unix-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-48/OPP.c b/bootstrap/unix-48/OPP.c
index 69624c1f..24a04912 100644
--- a/bootstrap/unix-48/OPP.c
+++ b/bootstrap/unix-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPP.h b/bootstrap/unix-48/OPP.h
index b748e221..b6d59055 100644
--- a/bootstrap/unix-48/OPP.h
+++ b/bootstrap/unix-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-48/OPS.c b/bootstrap/unix-48/OPS.c
index eee78d80..311cbe15 100644
--- a/bootstrap/unix-48/OPS.c
+++ b/bootstrap/unix-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -198,7 +198,7 @@ static void OPS_Number (void)
 				while (i < n) {
 					d = Ord__7(dig[i], 0);
 					i += 1;
-					if (OPS_intval <= __DIV(9223372036854775807 - (INT64)d, 10)) {
+					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
 					} else {
 						OPS_err(203);
diff --git a/bootstrap/unix-48/OPS.h b/bootstrap/unix-48/OPS.h
index 7ab70899..28618fe1 100644
--- a/bootstrap/unix-48/OPS.h
+++ b/bootstrap/unix-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-48/OPT.c b/bootstrap/unix-48/OPT.c
index 174aae08..7284592a 100644
--- a/bootstrap/unix-48/OPT.c
+++ b/bootstrap/unix-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPT.h b/bootstrap/unix-48/OPT.h
index 67996e8e..ab443dff 100644
--- a/bootstrap/unix-48/OPT.h
+++ b/bootstrap/unix-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-48/OPV.c b/bootstrap/unix-48/OPV.c
index fb6ac690..5a44f258 100644
--- a/bootstrap/unix-48/OPV.c
+++ b/bootstrap/unix-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/OPV.h b/bootstrap/unix-48/OPV.h
index 43aaf24a..d26a1b3e 100644
--- a/bootstrap/unix-48/OPV.h
+++ b/bootstrap/unix-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-48/Out.c b/bootstrap/unix-48/Out.c
index a03cf592..73f0311a 100644
--- a/bootstrap/unix-48/Out.c
+++ b/bootstrap/unix-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -89,7 +89,7 @@ void Out_Int (INT64 x, INT64 n)
 	INT16 i;
 	BOOLEAN negative;
 	negative = x < 0;
-	if (x == (-9223372036854775807-1)) {
+	if (x == (-9223372036854775807LL-1)) {
 		__MOVE("8085774586302733229", s, 20);
 		i = 19;
 	} else {
@@ -175,7 +175,7 @@ static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_)
 	INT64 m;
 	INT16 d, dr;
 	e = (INT16)__MASK(__ASHR((__VAL(INT64, x)), 52), -2048);
-	f = __MASK((__VAL(INT64, x)), -4503599627370496);
+	f = __MASK((__VAL(INT64, x)), -4503599627370496LL);
 	nn = (__VAL(INT64, x) < 0 && !((e == 2047 && f != 0)));
 	if (nn) {
 		n -= 1;
diff --git a/bootstrap/unix-48/Out.h b/bootstrap/unix-48/Out.h
index 27f2c9bb..a4eb7cb6 100644
--- a/bootstrap/unix-48/Out.h
+++ b/bootstrap/unix-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-48/Platform.c b/bootstrap/unix-48/Platform.c
index 1fc766bf..95c8d97b 100644
--- a/bootstrap/unix-48/Platform.c
+++ b/bootstrap/unix-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Platform.h b/bootstrap/unix-48/Platform.h
index 9be32cda..1f183fc5 100644
--- a/bootstrap/unix-48/Platform.h
+++ b/bootstrap/unix-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-48/Reals.c b/bootstrap/unix-48/Reals.c
index e4149017..33c286b7 100644
--- a/bootstrap/unix-48/Reals.c
+++ b/bootstrap/unix-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Reals.h b/bootstrap/unix-48/Reals.h
index e3bfadb5..6fc2dd5c 100644
--- a/bootstrap/unix-48/Reals.h
+++ b/bootstrap/unix-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-48/Strings.c b/bootstrap/unix-48/Strings.c
index a3f1e808..42190367 100644
--- a/bootstrap/unix-48/Strings.c
+++ b/bootstrap/unix-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/Strings.h b/bootstrap/unix-48/Strings.h
index b192b7bb..1806a7cc 100644
--- a/bootstrap/unix-48/Strings.h
+++ b/bootstrap/unix-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-48/Texts.c b/bootstrap/unix-48/Texts.c
index 4fa93c49..cc68acd9 100644
--- a/bootstrap/unix-48/Texts.c
+++ b/bootstrap/unix-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -1046,7 +1046,7 @@ void Texts_WriteInt (Texts_Writer *W, ADDRESS *W__typ, INT64 x, INT64 n)
 	CHAR a[24];
 	i = 0;
 	if (x < 0) {
-		if (x == (-9223372036854775807-1)) {
+		if (x == (-9223372036854775807LL-1)) {
 			Texts_WriteString(&*W, W__typ, (CHAR*)" -9223372036854775808", 22);
 			return;
 		} else {
diff --git a/bootstrap/unix-48/Texts.h b/bootstrap/unix-48/Texts.h
index 235cecb4..9aed03da 100644
--- a/bootstrap/unix-48/Texts.h
+++ b/bootstrap/unix-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-48/VT100.c b/bootstrap/unix-48/VT100.c
index 7a2a840d..c6c421f9 100644
--- a/bootstrap/unix-48/VT100.c
+++ b/bootstrap/unix-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-48/VT100.h b/bootstrap/unix-48/VT100.h
index 5a3fe6d0..b1771722 100644
--- a/bootstrap/unix-48/VT100.h
+++ b/bootstrap/unix-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c
index 657534b4..e89705a7 100644
--- a/bootstrap/unix-48/extTools.c
+++ b/bootstrap/unix-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
 
 static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
-	__COPY("gcc -g", s, s__len);
+	__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
 	Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
 	Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
@@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
 	Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
 	if (statically) {
-		Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
+		Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	}
 	Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
 	Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
diff --git a/bootstrap/unix-48/extTools.h b/bootstrap/unix-48/extTools.h
index 6ad7abb0..e92a4c5f 100644
--- a/bootstrap/unix-48/extTools.h
+++ b/bootstrap/unix-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/unix-88/Compiler.c b/bootstrap/unix-88/Compiler.c
index e59d7615..9322477d 100644
--- a/bootstrap/unix-88/Compiler.c
+++ b/bootstrap/unix-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Configuration.c b/bootstrap/unix-88/Configuration.c
index 01281cfc..f30fe61f 100644
--- a/bootstrap/unix-88/Configuration.c
+++ b/bootstrap/unix-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/Configuration.h b/bootstrap/unix-88/Configuration.h
index 98f85767..39dd27b9 100644
--- a/bootstrap/unix-88/Configuration.h
+++ b/bootstrap/unix-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/unix-88/Files.c b/bootstrap/unix-88/Files.c
index 0c219af5..a2d72b8e 100644
--- a/bootstrap/unix-88/Files.c
+++ b/bootstrap/unix-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Files.h b/bootstrap/unix-88/Files.h
index 4a1cbfe9..4dab2431 100644
--- a/bootstrap/unix-88/Files.h
+++ b/bootstrap/unix-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/unix-88/Heap.c b/bootstrap/unix-88/Heap.c
index 222162d5..5f4cd2f3 100644
--- a/bootstrap/unix-88/Heap.c
+++ b/bootstrap/unix-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -721,10 +721,10 @@ void Heap_InitHeap (void)
 	Heap_heapsize = 0;
 	Heap_allocated = 0;
 	Heap_lockdepth = 0;
-	Heap_heapPosMin = 9223372036854775807;
+	Heap_heapPosMin = 9223372036854775807LL;
 	Heap_heapPosMax = 0;
 	Heap_heapNegMin = 0;
-	Heap_heapNegMax = (-9223372036854775807-1);
+	Heap_heapNegMax = (-9223372036854775807LL-1);
 	Heap_heap = Heap_NewChunk(256000);
 	__PUT(Heap_heap, 0, INT64);
 	Heap_firstTry = 1;
diff --git a/bootstrap/unix-88/Heap.h b/bootstrap/unix-88/Heap.h
index 585db2f0..da41e4b8 100644
--- a/bootstrap/unix-88/Heap.h
+++ b/bootstrap/unix-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/unix-88/Modules.c b/bootstrap/unix-88/Modules.c
index b0cf5fd9..fcf1bb3a 100644
--- a/bootstrap/unix-88/Modules.c
+++ b/bootstrap/unix-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Modules.h b/bootstrap/unix-88/Modules.h
index a3e555ef..327f139b 100644
--- a/bootstrap/unix-88/Modules.h
+++ b/bootstrap/unix-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/unix-88/OPB.c b/bootstrap/unix-88/OPB.c
index d9e826b8..57fde3a0 100644
--- a/bootstrap/unix-88/OPB.c
+++ b/bootstrap/unix-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -550,7 +550,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0xf0, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = -z->conval->intval;
@@ -577,7 +577,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0x70, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = __ABS(z->conval->intval);
@@ -920,7 +920,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			if (f == 4) {
 				xv = xval->intval;
 				yv = yval->intval;
-				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) {
+				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807LL, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807LL-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807LL-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807LL-1))) && yv != (-9223372036854775807LL-1))) && -xv <= __DIV(9223372036854775807LL, -yv))) {
 					xval->intval = xv * yv;
 					OPB_SetIntType(x);
 				} else {
@@ -999,8 +999,8 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 6: 
 			if (f == 4) {
-				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval);
-				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) {
+				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807LL - yval->intval);
+				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807LL-1) - yval->intval)) {
 					xval->intval += yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -1023,7 +1023,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 7: 
 			if (f == 4) {
-				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) {
+				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807LL-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807LL + yval->intval)) {
 					xval->intval -= yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -2087,7 +2087,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, INT8 fctno)
 						OPB_err(208);
 						p->conval->intval = 1;
 					} else if (x->conval->intval >= 0) {
-						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807, (INT64)__ASH(1, x->conval->intval))) {
+						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807LL, (INT64)__ASH(1, x->conval->intval))) {
 							p->conval->intval = p->conval->intval * (INT64)__ASH(1, x->conval->intval);
 						} else {
 							OPB_err(208);
@@ -2585,7 +2585,7 @@ export void *OPB__init(void)
 	__MODULE_IMPORT(OPT);
 	__REGMOD("OPB", 0);
 /* BEGIN */
-	OPB_maxExp = OPB_log(4611686018427387904);
+	OPB_maxExp = OPB_log(4611686018427387904LL);
 	OPB_maxExp = OPB_exp;
 	__ENDMOD;
 }
diff --git a/bootstrap/unix-88/OPB.h b/bootstrap/unix-88/OPB.h
index 2c396170..e841f317 100644
--- a/bootstrap/unix-88/OPB.h
+++ b/bootstrap/unix-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/unix-88/OPC.c b/bootstrap/unix-88/OPC.c
index 5f4dc826..73872a51 100644
--- a/bootstrap/unix-88/OPC.c
+++ b/bootstrap/unix-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPC.h b/bootstrap/unix-88/OPC.h
index f9bc06a4..06fa9996 100644
--- a/bootstrap/unix-88/OPC.h
+++ b/bootstrap/unix-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/unix-88/OPM.c b/bootstrap/unix-88/OPM.c
index f52cb5e2..0533cbfc 100644
--- a/bootstrap/unix-88/OPM.c
+++ b/bootstrap/unix-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -893,7 +893,7 @@ void OPM_WriteHex (INT64 i)
 
 void OPM_WriteInt (INT64 i)
 {
-	CHAR s[24];
+	CHAR s[26];
 	INT64 i1, k;
 	if ((i == OPM_SignedMinimum(2) || i == OPM_SignedMinimum(4)) || i == OPM_SignedMinimum(8)) {
 		OPM_Write('(');
@@ -901,21 +901,27 @@ void OPM_WriteInt (INT64 i)
 		OPM_WriteString((CHAR*)"-1)", 4);
 	} else {
 		i1 = __ABS(i);
-		s[0] = (CHAR)(__MOD(i1, 10) + 48);
+		if (i1 <= 2147483647) {
+			k = 0;
+		} else {
+			__MOVE("LL", s, 3);
+			k = 2;
+		}
+		s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 		i1 = __DIV(i1, 10);
-		k = 1;
+		k += 1;
 		while (i1 > 0) {
-			s[__X(k, 24)] = (CHAR)(__MOD(i1, 10) + 48);
+			s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 			i1 = __DIV(i1, 10);
 			k += 1;
 		}
 		if (i < 0) {
-			s[__X(k, 24)] = '-';
+			s[__X(k, 26)] = '-';
 			k += 1;
 		}
 		while (k > 0) {
 			k -= 1;
-			OPM_Write(s[__X(k, 24)]);
+			OPM_Write(s[__X(k, 26)]);
 		}
 	}
 }
diff --git a/bootstrap/unix-88/OPM.h b/bootstrap/unix-88/OPM.h
index 979995c8..6ea722dc 100644
--- a/bootstrap/unix-88/OPM.h
+++ b/bootstrap/unix-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/unix-88/OPP.c b/bootstrap/unix-88/OPP.c
index 954279d4..a7630159 100644
--- a/bootstrap/unix-88/OPP.c
+++ b/bootstrap/unix-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPP.h b/bootstrap/unix-88/OPP.h
index b748e221..b6d59055 100644
--- a/bootstrap/unix-88/OPP.h
+++ b/bootstrap/unix-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/unix-88/OPS.c b/bootstrap/unix-88/OPS.c
index eee78d80..311cbe15 100644
--- a/bootstrap/unix-88/OPS.c
+++ b/bootstrap/unix-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -198,7 +198,7 @@ static void OPS_Number (void)
 				while (i < n) {
 					d = Ord__7(dig[i], 0);
 					i += 1;
-					if (OPS_intval <= __DIV(9223372036854775807 - (INT64)d, 10)) {
+					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
 					} else {
 						OPS_err(203);
diff --git a/bootstrap/unix-88/OPS.h b/bootstrap/unix-88/OPS.h
index 7ab70899..28618fe1 100644
--- a/bootstrap/unix-88/OPS.h
+++ b/bootstrap/unix-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/unix-88/OPT.c b/bootstrap/unix-88/OPT.c
index b58d6175..0dd110b2 100644
--- a/bootstrap/unix-88/OPT.c
+++ b/bootstrap/unix-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPT.h b/bootstrap/unix-88/OPT.h
index 67996e8e..ab443dff 100644
--- a/bootstrap/unix-88/OPT.h
+++ b/bootstrap/unix-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/unix-88/OPV.c b/bootstrap/unix-88/OPV.c
index 22c12372..6a1d23a7 100644
--- a/bootstrap/unix-88/OPV.c
+++ b/bootstrap/unix-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/OPV.h b/bootstrap/unix-88/OPV.h
index 43aaf24a..d26a1b3e 100644
--- a/bootstrap/unix-88/OPV.h
+++ b/bootstrap/unix-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/unix-88/Out.c b/bootstrap/unix-88/Out.c
index a03cf592..73f0311a 100644
--- a/bootstrap/unix-88/Out.c
+++ b/bootstrap/unix-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -89,7 +89,7 @@ void Out_Int (INT64 x, INT64 n)
 	INT16 i;
 	BOOLEAN negative;
 	negative = x < 0;
-	if (x == (-9223372036854775807-1)) {
+	if (x == (-9223372036854775807LL-1)) {
 		__MOVE("8085774586302733229", s, 20);
 		i = 19;
 	} else {
@@ -175,7 +175,7 @@ static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_)
 	INT64 m;
 	INT16 d, dr;
 	e = (INT16)__MASK(__ASHR((__VAL(INT64, x)), 52), -2048);
-	f = __MASK((__VAL(INT64, x)), -4503599627370496);
+	f = __MASK((__VAL(INT64, x)), -4503599627370496LL);
 	nn = (__VAL(INT64, x) < 0 && !((e == 2047 && f != 0)));
 	if (nn) {
 		n -= 1;
diff --git a/bootstrap/unix-88/Out.h b/bootstrap/unix-88/Out.h
index 27f2c9bb..a4eb7cb6 100644
--- a/bootstrap/unix-88/Out.h
+++ b/bootstrap/unix-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/unix-88/Platform.c b/bootstrap/unix-88/Platform.c
index eadd3813..11b9bd14 100644
--- a/bootstrap/unix-88/Platform.c
+++ b/bootstrap/unix-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Platform.h b/bootstrap/unix-88/Platform.h
index ee748a4f..f84abacb 100644
--- a/bootstrap/unix-88/Platform.h
+++ b/bootstrap/unix-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/unix-88/Reals.c b/bootstrap/unix-88/Reals.c
index e4149017..33c286b7 100644
--- a/bootstrap/unix-88/Reals.c
+++ b/bootstrap/unix-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Reals.h b/bootstrap/unix-88/Reals.h
index e3bfadb5..6fc2dd5c 100644
--- a/bootstrap/unix-88/Reals.h
+++ b/bootstrap/unix-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/unix-88/Strings.c b/bootstrap/unix-88/Strings.c
index a3f1e808..42190367 100644
--- a/bootstrap/unix-88/Strings.c
+++ b/bootstrap/unix-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/Strings.h b/bootstrap/unix-88/Strings.h
index b192b7bb..1806a7cc 100644
--- a/bootstrap/unix-88/Strings.h
+++ b/bootstrap/unix-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/unix-88/Texts.c b/bootstrap/unix-88/Texts.c
index a7cc3ff1..627eb31d 100644
--- a/bootstrap/unix-88/Texts.c
+++ b/bootstrap/unix-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -1046,7 +1046,7 @@ void Texts_WriteInt (Texts_Writer *W, ADDRESS *W__typ, INT64 x, INT64 n)
 	CHAR a[24];
 	i = 0;
 	if (x < 0) {
-		if (x == (-9223372036854775807-1)) {
+		if (x == (-9223372036854775807LL-1)) {
 			Texts_WriteString(&*W, W__typ, (CHAR*)" -9223372036854775808", 22);
 			return;
 		} else {
diff --git a/bootstrap/unix-88/Texts.h b/bootstrap/unix-88/Texts.h
index 8c1b9016..ac4a8157 100644
--- a/bootstrap/unix-88/Texts.h
+++ b/bootstrap/unix-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/unix-88/VT100.c b/bootstrap/unix-88/VT100.c
index 7a2a840d..c6c421f9 100644
--- a/bootstrap/unix-88/VT100.c
+++ b/bootstrap/unix-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/unix-88/VT100.h b/bootstrap/unix-88/VT100.h
index 5a3fe6d0..b1771722 100644
--- a/bootstrap/unix-88/VT100.h
+++ b/bootstrap/unix-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c
index 657534b4..e89705a7 100644
--- a/bootstrap/unix-88/extTools.c
+++ b/bootstrap/unix-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
 
 static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
-	__COPY("gcc -g", s, s__len);
+	__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
 	Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
 	Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
@@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
 	Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
 	if (statically) {
-		Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
+		Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	}
 	Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
 	Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
diff --git a/bootstrap/unix-88/extTools.h b/bootstrap/unix-88/extTools.h
index 6ad7abb0..e92a4c5f 100644
--- a/bootstrap/unix-88/extTools.h
+++ b/bootstrap/unix-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-48/Compiler.c b/bootstrap/windows-48/Compiler.c
index e59d7615..9322477d 100644
--- a/bootstrap/windows-48/Compiler.c
+++ b/bootstrap/windows-48/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Configuration.c b/bootstrap/windows-48/Configuration.c
index 01281cfc..f30fe61f 100644
--- a/bootstrap/windows-48/Configuration.c
+++ b/bootstrap/windows-48/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/Configuration.h b/bootstrap/windows-48/Configuration.h
index 98f85767..39dd27b9 100644
--- a/bootstrap/windows-48/Configuration.h
+++ b/bootstrap/windows-48/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-48/Files.c b/bootstrap/windows-48/Files.c
index 841d80d9..c0bb12ed 100644
--- a/bootstrap/windows-48/Files.c
+++ b/bootstrap/windows-48/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Files.h b/bootstrap/windows-48/Files.h
index dab76a88..b2973453 100644
--- a/bootstrap/windows-48/Files.h
+++ b/bootstrap/windows-48/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-48/Heap.c b/bootstrap/windows-48/Heap.c
index b6abc8f3..95b746d7 100644
--- a/bootstrap/windows-48/Heap.c
+++ b/bootstrap/windows-48/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Heap.h b/bootstrap/windows-48/Heap.h
index 82ebd04d..86033649 100644
--- a/bootstrap/windows-48/Heap.h
+++ b/bootstrap/windows-48/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-48/Modules.c b/bootstrap/windows-48/Modules.c
index 98b3a7e9..85b323b2 100644
--- a/bootstrap/windows-48/Modules.c
+++ b/bootstrap/windows-48/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Modules.h b/bootstrap/windows-48/Modules.h
index 3ab94701..92ebb074 100644
--- a/bootstrap/windows-48/Modules.h
+++ b/bootstrap/windows-48/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-48/OPB.c b/bootstrap/windows-48/OPB.c
index d9e826b8..57fde3a0 100644
--- a/bootstrap/windows-48/OPB.c
+++ b/bootstrap/windows-48/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -550,7 +550,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0xf0, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = -z->conval->intval;
@@ -577,7 +577,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0x70, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = __ABS(z->conval->intval);
@@ -920,7 +920,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			if (f == 4) {
 				xv = xval->intval;
 				yv = yval->intval;
-				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) {
+				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807LL, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807LL-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807LL-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807LL-1))) && yv != (-9223372036854775807LL-1))) && -xv <= __DIV(9223372036854775807LL, -yv))) {
 					xval->intval = xv * yv;
 					OPB_SetIntType(x);
 				} else {
@@ -999,8 +999,8 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 6: 
 			if (f == 4) {
-				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval);
-				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) {
+				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807LL - yval->intval);
+				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807LL-1) - yval->intval)) {
 					xval->intval += yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -1023,7 +1023,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 7: 
 			if (f == 4) {
-				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) {
+				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807LL-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807LL + yval->intval)) {
 					xval->intval -= yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -2087,7 +2087,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, INT8 fctno)
 						OPB_err(208);
 						p->conval->intval = 1;
 					} else if (x->conval->intval >= 0) {
-						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807, (INT64)__ASH(1, x->conval->intval))) {
+						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807LL, (INT64)__ASH(1, x->conval->intval))) {
 							p->conval->intval = p->conval->intval * (INT64)__ASH(1, x->conval->intval);
 						} else {
 							OPB_err(208);
@@ -2585,7 +2585,7 @@ export void *OPB__init(void)
 	__MODULE_IMPORT(OPT);
 	__REGMOD("OPB", 0);
 /* BEGIN */
-	OPB_maxExp = OPB_log(4611686018427387904);
+	OPB_maxExp = OPB_log(4611686018427387904LL);
 	OPB_maxExp = OPB_exp;
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-48/OPB.h b/bootstrap/windows-48/OPB.h
index 2c396170..e841f317 100644
--- a/bootstrap/windows-48/OPB.h
+++ b/bootstrap/windows-48/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-48/OPC.c b/bootstrap/windows-48/OPC.c
index 5f4dc826..73872a51 100644
--- a/bootstrap/windows-48/OPC.c
+++ b/bootstrap/windows-48/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPC.h b/bootstrap/windows-48/OPC.h
index f9bc06a4..06fa9996 100644
--- a/bootstrap/windows-48/OPC.h
+++ b/bootstrap/windows-48/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-48/OPM.c b/bootstrap/windows-48/OPM.c
index 1732c950..9aca428d 100644
--- a/bootstrap/windows-48/OPM.c
+++ b/bootstrap/windows-48/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -893,7 +893,7 @@ void OPM_WriteHex (INT64 i)
 
 void OPM_WriteInt (INT64 i)
 {
-	CHAR s[24];
+	CHAR s[26];
 	INT64 i1, k;
 	if ((i == OPM_SignedMinimum(2) || i == OPM_SignedMinimum(4)) || i == OPM_SignedMinimum(8)) {
 		OPM_Write('(');
@@ -901,21 +901,27 @@ void OPM_WriteInt (INT64 i)
 		OPM_WriteString((CHAR*)"-1)", 4);
 	} else {
 		i1 = __ABS(i);
-		s[0] = (CHAR)(__MOD(i1, 10) + 48);
+		if (i1 <= 2147483647) {
+			k = 0;
+		} else {
+			__MOVE("LL", s, 3);
+			k = 2;
+		}
+		s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 		i1 = __DIV(i1, 10);
-		k = 1;
+		k += 1;
 		while (i1 > 0) {
-			s[__X(k, 24)] = (CHAR)(__MOD(i1, 10) + 48);
+			s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 			i1 = __DIV(i1, 10);
 			k += 1;
 		}
 		if (i < 0) {
-			s[__X(k, 24)] = '-';
+			s[__X(k, 26)] = '-';
 			k += 1;
 		}
 		while (k > 0) {
 			k -= 1;
-			OPM_Write(s[__X(k, 24)]);
+			OPM_Write(s[__X(k, 26)]);
 		}
 	}
 }
diff --git a/bootstrap/windows-48/OPM.h b/bootstrap/windows-48/OPM.h
index 979995c8..6ea722dc 100644
--- a/bootstrap/windows-48/OPM.h
+++ b/bootstrap/windows-48/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-48/OPP.c b/bootstrap/windows-48/OPP.c
index 69624c1f..24a04912 100644
--- a/bootstrap/windows-48/OPP.c
+++ b/bootstrap/windows-48/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPP.h b/bootstrap/windows-48/OPP.h
index b748e221..b6d59055 100644
--- a/bootstrap/windows-48/OPP.h
+++ b/bootstrap/windows-48/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-48/OPS.c b/bootstrap/windows-48/OPS.c
index eee78d80..311cbe15 100644
--- a/bootstrap/windows-48/OPS.c
+++ b/bootstrap/windows-48/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -198,7 +198,7 @@ static void OPS_Number (void)
 				while (i < n) {
 					d = Ord__7(dig[i], 0);
 					i += 1;
-					if (OPS_intval <= __DIV(9223372036854775807 - (INT64)d, 10)) {
+					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
 					} else {
 						OPS_err(203);
diff --git a/bootstrap/windows-48/OPS.h b/bootstrap/windows-48/OPS.h
index 7ab70899..28618fe1 100644
--- a/bootstrap/windows-48/OPS.h
+++ b/bootstrap/windows-48/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-48/OPT.c b/bootstrap/windows-48/OPT.c
index 174aae08..7284592a 100644
--- a/bootstrap/windows-48/OPT.c
+++ b/bootstrap/windows-48/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPT.h b/bootstrap/windows-48/OPT.h
index 67996e8e..ab443dff 100644
--- a/bootstrap/windows-48/OPT.h
+++ b/bootstrap/windows-48/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/windows-48/OPV.c b/bootstrap/windows-48/OPV.c
index fb6ac690..5a44f258 100644
--- a/bootstrap/windows-48/OPV.c
+++ b/bootstrap/windows-48/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/OPV.h b/bootstrap/windows-48/OPV.h
index 43aaf24a..d26a1b3e 100644
--- a/bootstrap/windows-48/OPV.h
+++ b/bootstrap/windows-48/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-48/Out.c b/bootstrap/windows-48/Out.c
index 0d3f9e29..b5ccb18b 100644
--- a/bootstrap/windows-48/Out.c
+++ b/bootstrap/windows-48/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -89,7 +89,7 @@ void Out_Int (INT64 x, INT64 n)
 	INT16 i;
 	BOOLEAN negative;
 	negative = x < 0;
-	if (x == (-9223372036854775807-1)) {
+	if (x == (-9223372036854775807LL-1)) {
 		__MOVE("8085774586302733229", s, 20);
 		i = 19;
 	} else {
@@ -175,7 +175,7 @@ static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_)
 	INT64 m;
 	INT16 d, dr;
 	e = (INT16)__MASK(__ASHR((__VAL(INT64, x)), 52), -2048);
-	f = __MASK((__VAL(INT64, x)), -4503599627370496);
+	f = __MASK((__VAL(INT64, x)), -4503599627370496LL);
 	nn = (__VAL(INT64, x) < 0 && !((e == 2047 && f != 0)));
 	if (nn) {
 		n -= 1;
diff --git a/bootstrap/windows-48/Out.h b/bootstrap/windows-48/Out.h
index 27f2c9bb..a4eb7cb6 100644
--- a/bootstrap/windows-48/Out.h
+++ b/bootstrap/windows-48/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/windows-48/Platform.c b/bootstrap/windows-48/Platform.c
index 4a164fb8..20c5ca89 100644
--- a/bootstrap/windows-48/Platform.c
+++ b/bootstrap/windows-48/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Platform.h b/bootstrap/windows-48/Platform.h
index adfe4173..f53d70ed 100644
--- a/bootstrap/windows-48/Platform.h
+++ b/bootstrap/windows-48/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/windows-48/Reals.c b/bootstrap/windows-48/Reals.c
index e4149017..33c286b7 100644
--- a/bootstrap/windows-48/Reals.c
+++ b/bootstrap/windows-48/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Reals.h b/bootstrap/windows-48/Reals.h
index e3bfadb5..6fc2dd5c 100644
--- a/bootstrap/windows-48/Reals.h
+++ b/bootstrap/windows-48/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-48/Strings.c b/bootstrap/windows-48/Strings.c
index a3f1e808..42190367 100644
--- a/bootstrap/windows-48/Strings.c
+++ b/bootstrap/windows-48/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/Strings.h b/bootstrap/windows-48/Strings.h
index b192b7bb..1806a7cc 100644
--- a/bootstrap/windows-48/Strings.h
+++ b/bootstrap/windows-48/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-48/Texts.c b/bootstrap/windows-48/Texts.c
index 4fa93c49..cc68acd9 100644
--- a/bootstrap/windows-48/Texts.c
+++ b/bootstrap/windows-48/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -1046,7 +1046,7 @@ void Texts_WriteInt (Texts_Writer *W, ADDRESS *W__typ, INT64 x, INT64 n)
 	CHAR a[24];
 	i = 0;
 	if (x < 0) {
-		if (x == (-9223372036854775807-1)) {
+		if (x == (-9223372036854775807LL-1)) {
 			Texts_WriteString(&*W, W__typ, (CHAR*)" -9223372036854775808", 22);
 			return;
 		} else {
diff --git a/bootstrap/windows-48/Texts.h b/bootstrap/windows-48/Texts.h
index 235cecb4..9aed03da 100644
--- a/bootstrap/windows-48/Texts.h
+++ b/bootstrap/windows-48/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-48/VT100.c b/bootstrap/windows-48/VT100.c
index 7a2a840d..c6c421f9 100644
--- a/bootstrap/windows-48/VT100.c
+++ b/bootstrap/windows-48/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-48/VT100.h b/bootstrap/windows-48/VT100.h
index 5a3fe6d0..b1771722 100644
--- a/bootstrap/windows-48/VT100.h
+++ b/bootstrap/windows-48/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c
index 657534b4..e89705a7 100644
--- a/bootstrap/windows-48/extTools.c
+++ b/bootstrap/windows-48/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
 
 static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
-	__COPY("gcc -g", s, s__len);
+	__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
 	Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
 	Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
@@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
 	Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
 	if (statically) {
-		Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
+		Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	}
 	Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
 	Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
diff --git a/bootstrap/windows-48/extTools.h b/bootstrap/windows-48/extTools.h
index 6ad7abb0..e92a4c5f 100644
--- a/bootstrap/windows-48/extTools.h
+++ b/bootstrap/windows-48/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h
diff --git a/bootstrap/windows-88/Compiler.c b/bootstrap/windows-88/Compiler.c
index e59d7615..9322477d 100644
--- a/bootstrap/windows-88/Compiler.c
+++ b/bootstrap/windows-88/Compiler.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspamS */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Configuration.c b/bootstrap/windows-88/Configuration.c
index 01281cfc..f30fe61f 100644
--- a/bootstrap/windows-88/Configuration.c
+++ b/bootstrap/windows-88/Configuration.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -19,6 +19,6 @@ export void *Configuration__init(void)
 	__DEFMOD;
 	__REGMOD("Configuration", 0);
 /* BEGIN */
-	__MOVE("2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
+	__MOVE("2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8.", Configuration_versionLong, 75);
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/Configuration.h b/bootstrap/windows-88/Configuration.h
index 98f85767..39dd27b9 100644
--- a/bootstrap/windows-88/Configuration.h
+++ b/bootstrap/windows-88/Configuration.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Configuration__h
 #define Configuration__h
diff --git a/bootstrap/windows-88/Files.c b/bootstrap/windows-88/Files.c
index 8ad0e207..27810f46 100644
--- a/bootstrap/windows-88/Files.c
+++ b/bootstrap/windows-88/Files.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Files.h b/bootstrap/windows-88/Files.h
index 3631e4aa..8d9e7acc 100644
--- a/bootstrap/windows-88/Files.h
+++ b/bootstrap/windows-88/Files.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef Files__h
 #define Files__h
diff --git a/bootstrap/windows-88/Heap.c b/bootstrap/windows-88/Heap.c
index 222162d5..5f4cd2f3 100644
--- a/bootstrap/windows-88/Heap.c
+++ b/bootstrap/windows-88/Heap.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -721,10 +721,10 @@ void Heap_InitHeap (void)
 	Heap_heapsize = 0;
 	Heap_allocated = 0;
 	Heap_lockdepth = 0;
-	Heap_heapPosMin = 9223372036854775807;
+	Heap_heapPosMin = 9223372036854775807LL;
 	Heap_heapPosMax = 0;
 	Heap_heapNegMin = 0;
-	Heap_heapNegMax = (-9223372036854775807-1);
+	Heap_heapNegMax = (-9223372036854775807LL-1);
 	Heap_heap = Heap_NewChunk(256000);
 	__PUT(Heap_heap, 0, INT64);
 	Heap_firstTry = 1;
diff --git a/bootstrap/windows-88/Heap.h b/bootstrap/windows-88/Heap.h
index 585db2f0..da41e4b8 100644
--- a/bootstrap/windows-88/Heap.h
+++ b/bootstrap/windows-88/Heap.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tsSF */
 
 #ifndef Heap__h
 #define Heap__h
diff --git a/bootstrap/windows-88/Modules.c b/bootstrap/windows-88/Modules.c
index c6884be5..d3b0e7ec 100644
--- a/bootstrap/windows-88/Modules.c
+++ b/bootstrap/windows-88/Modules.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Modules.h b/bootstrap/windows-88/Modules.h
index a3e555ef..327f139b 100644
--- a/bootstrap/windows-88/Modules.h
+++ b/bootstrap/windows-88/Modules.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Modules__h
 #define Modules__h
diff --git a/bootstrap/windows-88/OPB.c b/bootstrap/windows-88/OPB.c
index d9e826b8..57fde3a0 100644
--- a/bootstrap/windows-88/OPB.c
+++ b/bootstrap/windows-88/OPB.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -550,7 +550,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0xf0, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = -z->conval->intval;
@@ -577,7 +577,7 @@ void OPB_MOp (INT8 op, OPT_Node *x)
 				if (__IN(f, 0x70, 32)) {
 					if (z->class == 7) {
 						if (f == 4) {
-							if (z->conval->intval == (-9223372036854775807-1)) {
+							if (z->conval->intval == (-9223372036854775807LL-1)) {
 								OPB_err(203);
 							} else {
 								z->conval->intval = __ABS(z->conval->intval);
@@ -920,7 +920,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			if (f == 4) {
 				xv = xval->intval;
 				yv = yval->intval;
-				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807-1))) && yv != (-9223372036854775807-1))) && -xv <= __DIV(9223372036854775807, -yv))) {
+				if (((((xv == 0 || yv == 0) || (((xv > 0 && yv > 0)) && yv <= __DIV(9223372036854775807LL, xv))) || (((xv > 0 && yv < 0)) && yv >= __DIV((-9223372036854775807LL-1), xv))) || (((xv < 0 && yv > 0)) && xv >= __DIV((-9223372036854775807LL-1), yv))) || (((((((xv < 0 && yv < 0)) && xv != (-9223372036854775807LL-1))) && yv != (-9223372036854775807LL-1))) && -xv <= __DIV(9223372036854775807LL, -yv))) {
 					xval->intval = xv * yv;
 					OPB_SetIntType(x);
 				} else {
@@ -999,8 +999,8 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 6: 
 			if (f == 4) {
-				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807 - yval->intval);
-				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807-1) - yval->intval)) {
+				temp = (yval->intval >= 0 && xval->intval <= 9223372036854775807LL - yval->intval);
+				if (temp || (yval->intval < 0 && xval->intval >= (-9223372036854775807LL-1) - yval->intval)) {
 					xval->intval += yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -1023,7 +1023,7 @@ static void OPB_ConstOp (INT16 op, OPT_Node x, OPT_Node y)
 			break;
 		case 7: 
 			if (f == 4) {
-				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807 + yval->intval)) {
+				if ((yval->intval >= 0 && xval->intval >= (-9223372036854775807LL-1) + yval->intval) || (yval->intval < 0 && xval->intval <= 9223372036854775807LL + yval->intval)) {
 					xval->intval -= yval->intval;
 					OPB_SetIntType(x);
 				} else {
@@ -2087,7 +2087,7 @@ void OPB_StPar1 (OPT_Node *par0, OPT_Node x, INT8 fctno)
 						OPB_err(208);
 						p->conval->intval = 1;
 					} else if (x->conval->intval >= 0) {
-						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807, (INT64)__ASH(1, x->conval->intval))) {
+						if (__ABS(p->conval->intval) <= __DIV(9223372036854775807LL, (INT64)__ASH(1, x->conval->intval))) {
 							p->conval->intval = p->conval->intval * (INT64)__ASH(1, x->conval->intval);
 						} else {
 							OPB_err(208);
@@ -2585,7 +2585,7 @@ export void *OPB__init(void)
 	__MODULE_IMPORT(OPT);
 	__REGMOD("OPB", 0);
 /* BEGIN */
-	OPB_maxExp = OPB_log(4611686018427387904);
+	OPB_maxExp = OPB_log(4611686018427387904LL);
 	OPB_maxExp = OPB_exp;
 	__ENDMOD;
 }
diff --git a/bootstrap/windows-88/OPB.h b/bootstrap/windows-88/OPB.h
index 2c396170..e841f317 100644
--- a/bootstrap/windows-88/OPB.h
+++ b/bootstrap/windows-88/OPB.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPB__h
 #define OPB__h
diff --git a/bootstrap/windows-88/OPC.c b/bootstrap/windows-88/OPC.c
index 5f4dc826..73872a51 100644
--- a/bootstrap/windows-88/OPC.c
+++ b/bootstrap/windows-88/OPC.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPC.h b/bootstrap/windows-88/OPC.h
index f9bc06a4..06fa9996 100644
--- a/bootstrap/windows-88/OPC.h
+++ b/bootstrap/windows-88/OPC.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPC__h
 #define OPC__h
diff --git a/bootstrap/windows-88/OPM.c b/bootstrap/windows-88/OPM.c
index f52cb5e2..0533cbfc 100644
--- a/bootstrap/windows-88/OPM.c
+++ b/bootstrap/windows-88/OPM.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -893,7 +893,7 @@ void OPM_WriteHex (INT64 i)
 
 void OPM_WriteInt (INT64 i)
 {
-	CHAR s[24];
+	CHAR s[26];
 	INT64 i1, k;
 	if ((i == OPM_SignedMinimum(2) || i == OPM_SignedMinimum(4)) || i == OPM_SignedMinimum(8)) {
 		OPM_Write('(');
@@ -901,21 +901,27 @@ void OPM_WriteInt (INT64 i)
 		OPM_WriteString((CHAR*)"-1)", 4);
 	} else {
 		i1 = __ABS(i);
-		s[0] = (CHAR)(__MOD(i1, 10) + 48);
+		if (i1 <= 2147483647) {
+			k = 0;
+		} else {
+			__MOVE("LL", s, 3);
+			k = 2;
+		}
+		s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 		i1 = __DIV(i1, 10);
-		k = 1;
+		k += 1;
 		while (i1 > 0) {
-			s[__X(k, 24)] = (CHAR)(__MOD(i1, 10) + 48);
+			s[__X(k, 26)] = (CHAR)(__MOD(i1, 10) + 48);
 			i1 = __DIV(i1, 10);
 			k += 1;
 		}
 		if (i < 0) {
-			s[__X(k, 24)] = '-';
+			s[__X(k, 26)] = '-';
 			k += 1;
 		}
 		while (k > 0) {
 			k -= 1;
-			OPM_Write(s[__X(k, 24)]);
+			OPM_Write(s[__X(k, 26)]);
 		}
 	}
 }
diff --git a/bootstrap/windows-88/OPM.h b/bootstrap/windows-88/OPM.h
index 979995c8..6ea722dc 100644
--- a/bootstrap/windows-88/OPM.h
+++ b/bootstrap/windows-88/OPM.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPM__h
 #define OPM__h
diff --git a/bootstrap/windows-88/OPP.c b/bootstrap/windows-88/OPP.c
index 954279d4..a7630159 100644
--- a/bootstrap/windows-88/OPP.c
+++ b/bootstrap/windows-88/OPP.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPP.h b/bootstrap/windows-88/OPP.h
index b748e221..b6d59055 100644
--- a/bootstrap/windows-88/OPP.h
+++ b/bootstrap/windows-88/OPP.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPP__h
 #define OPP__h
diff --git a/bootstrap/windows-88/OPS.c b/bootstrap/windows-88/OPS.c
index eee78d80..311cbe15 100644
--- a/bootstrap/windows-88/OPS.c
+++ b/bootstrap/windows-88/OPS.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -198,7 +198,7 @@ static void OPS_Number (void)
 				while (i < n) {
 					d = Ord__7(dig[i], 0);
 					i += 1;
-					if (OPS_intval <= __DIV(9223372036854775807 - (INT64)d, 10)) {
+					if (OPS_intval <= __DIV(9223372036854775807LL - (INT64)d, 10)) {
 						OPS_intval = OPS_intval * 10 + (INT64)d;
 					} else {
 						OPS_err(203);
diff --git a/bootstrap/windows-88/OPS.h b/bootstrap/windows-88/OPS.h
index 7ab70899..28618fe1 100644
--- a/bootstrap/windows-88/OPS.h
+++ b/bootstrap/windows-88/OPS.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. tspaSF */
 
 #ifndef OPS__h
 #define OPS__h
diff --git a/bootstrap/windows-88/OPT.c b/bootstrap/windows-88/OPT.c
index b58d6175..0dd110b2 100644
--- a/bootstrap/windows-88/OPT.c
+++ b/bootstrap/windows-88/OPT.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPT.h b/bootstrap/windows-88/OPT.h
index 67996e8e..ab443dff 100644
--- a/bootstrap/windows-88/OPT.h
+++ b/bootstrap/windows-88/OPT.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPT__h
 #define OPT__h
diff --git a/bootstrap/windows-88/OPV.c b/bootstrap/windows-88/OPV.c
index 22c12372..6a1d23a7 100644
--- a/bootstrap/windows-88/OPV.c
+++ b/bootstrap/windows-88/OPV.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/OPV.h b/bootstrap/windows-88/OPV.h
index 43aaf24a..d26a1b3e 100644
--- a/bootstrap/windows-88/OPV.h
+++ b/bootstrap/windows-88/OPV.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef OPV__h
 #define OPV__h
diff --git a/bootstrap/windows-88/Out.c b/bootstrap/windows-88/Out.c
index 0d3f9e29..b5ccb18b 100644
--- a/bootstrap/windows-88/Out.c
+++ b/bootstrap/windows-88/Out.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -89,7 +89,7 @@ void Out_Int (INT64 x, INT64 n)
 	INT16 i;
 	BOOLEAN negative;
 	negative = x < 0;
-	if (x == (-9223372036854775807-1)) {
+	if (x == (-9223372036854775807LL-1)) {
 		__MOVE("8085774586302733229", s, 20);
 		i = 19;
 	} else {
@@ -175,7 +175,7 @@ static void Out_RealP (LONGREAL x, INT16 n, BOOLEAN long_)
 	INT64 m;
 	INT16 d, dr;
 	e = (INT16)__MASK(__ASHR((__VAL(INT64, x)), 52), -2048);
-	f = __MASK((__VAL(INT64, x)), -4503599627370496);
+	f = __MASK((__VAL(INT64, x)), -4503599627370496LL);
 	nn = (__VAL(INT64, x) < 0 && !((e == 2047 && f != 0)));
 	if (nn) {
 		n -= 1;
diff --git a/bootstrap/windows-88/Out.h b/bootstrap/windows-88/Out.h
index 27f2c9bb..a4eb7cb6 100644
--- a/bootstrap/windows-88/Out.h
+++ b/bootstrap/windows-88/Out.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Out__h
 #define Out__h
diff --git a/bootstrap/windows-88/Platform.c b/bootstrap/windows-88/Platform.c
index bad7600e..ca463179 100644
--- a/bootstrap/windows-88/Platform.c
+++ b/bootstrap/windows-88/Platform.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Platform.h b/bootstrap/windows-88/Platform.h
index 7d53aaad..03b75dc0 100644
--- a/bootstrap/windows-88/Platform.h
+++ b/bootstrap/windows-88/Platform.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Platform__h
 #define Platform__h
diff --git a/bootstrap/windows-88/Reals.c b/bootstrap/windows-88/Reals.c
index e4149017..33c286b7 100644
--- a/bootstrap/windows-88/Reals.c
+++ b/bootstrap/windows-88/Reals.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Reals.h b/bootstrap/windows-88/Reals.h
index e3bfadb5..6fc2dd5c 100644
--- a/bootstrap/windows-88/Reals.h
+++ b/bootstrap/windows-88/Reals.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Reals__h
 #define Reals__h
diff --git a/bootstrap/windows-88/Strings.c b/bootstrap/windows-88/Strings.c
index a3f1e808..42190367 100644
--- a/bootstrap/windows-88/Strings.c
+++ b/bootstrap/windows-88/Strings.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/Strings.h b/bootstrap/windows-88/Strings.h
index b192b7bb..1806a7cc 100644
--- a/bootstrap/windows-88/Strings.h
+++ b/bootstrap/windows-88/Strings.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Strings__h
 #define Strings__h
diff --git a/bootstrap/windows-88/Texts.c b/bootstrap/windows-88/Texts.c
index a7cc3ff1..627eb31d 100644
--- a/bootstrap/windows-88/Texts.c
+++ b/bootstrap/windows-88/Texts.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -1046,7 +1046,7 @@ void Texts_WriteInt (Texts_Writer *W, ADDRESS *W__typ, INT64 x, INT64 n)
 	CHAR a[24];
 	i = 0;
 	if (x < 0) {
-		if (x == (-9223372036854775807-1)) {
+		if (x == (-9223372036854775807LL-1)) {
 			Texts_WriteString(&*W, W__typ, (CHAR*)" -9223372036854775808", 22);
 			return;
 		} else {
diff --git a/bootstrap/windows-88/Texts.h b/bootstrap/windows-88/Texts.h
index 8c1b9016..ac4a8157 100644
--- a/bootstrap/windows-88/Texts.h
+++ b/bootstrap/windows-88/Texts.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef Texts__h
 #define Texts__h
diff --git a/bootstrap/windows-88/VT100.c b/bootstrap/windows-88/VT100.c
index 7a2a840d..c6c421f9 100644
--- a/bootstrap/windows-88/VT100.c
+++ b/bootstrap/windows-88/VT100.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
diff --git a/bootstrap/windows-88/VT100.h b/bootstrap/windows-88/VT100.h
index 5a3fe6d0..b1771722 100644
--- a/bootstrap/windows-88/VT100.h
+++ b/bootstrap/windows-88/VT100.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef VT100__h
 #define VT100__h
diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c
index 657534b4..e89705a7 100644
--- a/bootstrap/windows-88/extTools.c
+++ b/bootstrap/windows-88/extTools.c
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #define SHORTINT INT8
 #define INTEGER  INT16
@@ -65,7 +65,7 @@ static void extTools_execute (CHAR *title, ADDRESS title__len, CHAR *cmd, ADDRES
 
 static void extTools_InitialiseCompilerCommand (CHAR *s, ADDRESS s__len)
 {
-	__COPY("gcc -g", s, s__len);
+	__COPY("x86_64-w64-mingw32-gcc -g", s, s__len);
 	Strings_Append((CHAR*)" -I \"", 6, (void*)s, s__len);
 	Strings_Append(OPM_ResourceDir, 1024, (void*)s, s__len);
 	Strings_Append((CHAR*)"/include\" ", 11, (void*)s, s__len);
@@ -95,7 +95,7 @@ void extTools_LinkMain (CHAR *moduleName, ADDRESS moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)".c ", 4, (void*)cmd, 1023);
 	Strings_Append(additionalopts, additionalopts__len, (void*)cmd, 1023);
 	if (statically) {
-		Strings_Append((CHAR*)"-static", 8, (void*)cmd, 1023);
+		Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	}
 	Strings_Append((CHAR*)" -o ", 5, (void*)cmd, 1023);
 	Strings_Append(moduleName, moduleName__len, (void*)cmd, 1023);
diff --git a/bootstrap/windows-88/extTools.h b/bootstrap/windows-88/extTools.h
index 6ad7abb0..e92a4c5f 100644
--- a/bootstrap/windows-88/extTools.h
+++ b/bootstrap/windows-88/extTools.h
@@ -1,4 +1,4 @@
-/* voc 2.00 [2016/12/01]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
+/* voc 2.00 [2016/12/02]. Bootstrapping compiler for address size 8, alignment 8. xtspaSF */
 
 #ifndef extTools__h
 #define extTools__h