diff --git a/basis/compiler/cfg/builder/builder.factor b/basis/compiler/cfg/builder/builder.factor
index e46233add2..f680d3a504 100755
--- a/basis/compiler/cfg/builder/builder.factor
+++ b/basis/compiler/cfg/builder/builder.factor
@@ -1,4 +1,4 @@
- ! Copyright (C) 2004, 2008 Slava Pestov.
+! Copyright (C) 2004, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs combinators hashtables kernel
 math fry namespaces make sequences words byte-arrays
diff --git a/basis/compiler/cfg/intrinsics/slots/slots.factor b/basis/compiler/cfg/intrinsics/slots/slots.factor
index 3fea26c1af..cbc5d04c0b 100644
--- a/basis/compiler/cfg/intrinsics/slots/slots.factor
+++ b/basis/compiler/cfg/intrinsics/slots/slots.factor
@@ -12,12 +12,12 @@ IN: compiler.cfg.intrinsics.slots
 : value-tag ( info -- n ) class>> class-tag ; inline
 
 : (emit-slot) ( infos -- dst )
-    [ 2inputs ] [ first value-tag ] bi*
+    [ 2inputs ^^offset>slot ] [ first value-tag ] bi*
     ^^slot ;
 
 : (emit-slot-imm) ( infos -- dst )
     ds-drop
-    [ ds-pop ^^offset>slot ]
+    [ ds-pop ]
     [ [ second literal>> ] [ first value-tag ] bi ] bi*
     ^^slot-imm ;
 
diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor
index 1c597ac98a..0e4107eaee 100644
--- a/basis/cpu/x86/32/32.factor
+++ b/basis/cpu/x86/32/32.factor
@@ -74,7 +74,7 @@ M: float-regs store-return-reg
     [ [ align-sub ] [ call ] bi* ]
     [ [ align-add ] [ drop ] bi* ] 2bi ; inline
 
-M: x86.64 rel-literal-x86 rc-absolute-cell rel-literal ;
+M: x86.32 rel-literal-x86 rc-absolute-cell rel-literal ;
 
 M: x86.32 %prologue ( n -- )
     dup PUSH
@@ -281,10 +281,12 @@ os windows? [
 FUNCTION: bool check_sse2 ( ) ;
 
 : sse2? ( -- ? )
-    [ optimized-recompile-hook ] recompile-hook
-    [ [ check_sse2 ] compile-call ] with-variable ;
+    check_sse2 ;
 
 "-no-sse2" cli-args member? [
+    [ optimized-recompile-hook ] recompile-hook
+    [ { check_sse2 } compile ] with-variable
+
     "Checking if your CPU supports SSE2..." print flush
     sse2? [
         " - yes" print
diff --git a/vm/cpu-x86.32.S b/vm/cpu-x86.32.S
index 1613579244..9e73bd6777 100644
--- a/vm/cpu-x86.32.S
+++ b/vm/cpu-x86.32.S
@@ -40,9 +40,9 @@ DEF(void,set_callstack,(F_STACK_FRAME *to, F_STACK_FRAME *from, CELL length, voi
 	ret                                /* return _with new stack_ */
 
 /* cpu.x86.32 calls this */
-DEF(bool,check_sse2,())
+DEF(bool,check_sse2,()):
 	push %ebx
-	mov 1,%eax
+	mov $1,%eax
 	cpuid
 	shr $26,%edx
 	and $1,%edx