diff --git a/Makefile b/Makefile
index d9f25f36be..5098460ec6 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ solaris solaris-x86:
 
 windows:
 	$(MAKE) $(BINARY) \
-		CFLAGS="$(DEFAULT_CFLAGS) -DFFI -DWIN32" \
+		CFLAGS="$(DEFAULT_CFLAGS) -DWIN32" \
 		LIBS="$(DEFAULT_LIBS)" WIN32=y
 
 f: $(OBJS)
diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 888e8596ea..a4e5ca34a3 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -10,6 +10,8 @@
 - OS X stuff:
   - set resource path to bundle path
   - link in freetype statically
+- when generating a 32-bit image on a 64-bit system, large numbers which should
+  be bignums become fixnums
 
 + io:
 
diff --git a/library/bootstrap/image.factor b/library/bootstrap/image.factor
index da29b9b901..79ad828e06 100644
--- a/library/bootstrap/image.factor
+++ b/library/bootstrap/image.factor
@@ -112,7 +112,7 @@ M: fixnum ' ( n -- tagged ) fixnum-tag immediate ;
 
 ( Bignums )
 
-: bignum-bits cell-bits 2 - ;
+: bignum-bits bootstrap-cell-bits 2 - ;
 
 : bignum-radix bignum-bits 1 swap shift 1- ;
 
diff --git a/library/math/constants.factor b/library/math/constants.factor
index 7307bc76b8..0333308971 100644
--- a/library/math/constants.factor
+++ b/library/math/constants.factor
@@ -8,6 +8,7 @@ USING: namespaces math ;
 : bootstrap-cells bootstrap-cell * ; inline
 
 : cell-bits 8 cells ; inline
+: bootstrap-cell-bits 8 cells ; inline
 
 IN: math
 
diff --git a/library/test/math/random.factor b/library/test/math/random.factor
new file mode 100644
index 0000000000..3f0f38b199
--- /dev/null
+++ b/library/test/math/random.factor
@@ -0,0 +1,4 @@
+IN: temporary
+USING: kernel math sequences test ;
+
+[ t ] [ 100 [ drop 20 random-int 0 20 between? ] all? ] unit-test
diff --git a/library/test/test.factor b/library/test/test.factor
index 934c8aa126..02ccb2a5aa 100644
--- a/library/test/test.factor
+++ b/library/test/test.factor
@@ -83,7 +83,7 @@ SYMBOL: failures
         "words" "prettyprint" "random" "stream" "math/bitops"
         "math/math-combinators" "math/rational" "math/float"
         "math/complex" "math/irrational"
-        "math/integer" "threads" "parsing-word"
+        "math/integer" "math/random" "threads" "parsing-word"
         "inference" "interpreter" "alien"
         "gadgets/line-editor" "gadgets/rectangles"
         "gadgets/frames" "memory"