diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor
index ce1993ece4..9939154512 100755
--- a/basis/cpu/x86/32/32.factor
+++ b/basis/cpu/x86/32/32.factor
@@ -295,6 +295,4 @@ os windows? [
     4 "double" c-type (>>align)
 ] unless
 
-USE: vocabs.loader
-
 "cpu.x86.features" require
diff --git a/basis/cpu/x86/features/features-tests.factor b/basis/cpu/x86/features/features-tests.factor
index 680e655995..60c4bab8a1 100644
--- a/basis/cpu/x86/features/features-tests.factor
+++ b/basis/cpu/x86/features/features-tests.factor
@@ -1,7 +1,7 @@
-USING: cpu.x86.features tools.test kernel sequences math system ;
+USING: cpu.x86.features tools.test kernel sequences math math.order system ;
 IN: cpu.x86.features.tests
 
 cpu x86? [
-    [ t ] [ sse2? { t f } member? ] unit-test
+    [ t ] [ sse-version 0 42 between? ] unit-test
     [ t ] [ [ 10000 [ ] times ] count-instructions integer? ] unit-test
 ] when
diff --git a/basis/io/files/info/windows/windows.factor b/basis/io/files/info/windows/windows.factor
index 7ecd46f7e7..385a1eb196 100755
--- a/basis/io/files/info/windows/windows.factor
+++ b/basis/io/files/info/windows/windows.factor
@@ -129,8 +129,9 @@ ERROR: not-absolute-path ;
         [ first Letter? ]
     } 1&& [ 2 head "\\" append ] [ not-absolute-path ] if ;
 
-M: winnt file-system-info ( path -- file-system-info )
-    normalize-path root-directory
+<PRIVATE
+
+: (file-system-info) ( path -- file-system-info )
     dup [ volume-information ] [ file-system-space ] bi
     \ win32-file-system-info new
         swap *ulonglong >>free-space
@@ -144,6 +145,11 @@ M: winnt file-system-info ( path -- file-system-info )
         swap >>mount-point
     calculate-file-system-info ;
 
+PRIVATE>
+
+M: winnt file-system-info ( path -- file-system-info )
+    normalize-path root-directory (file-system-info) ;
+
 : volume>paths ( string -- array )
     16384 <ushort-array> tuck dup length
     0 <uint> dup [ GetVolumePathNamesForVolumeName 0 = ] dip swap [
@@ -180,7 +186,7 @@ M: winnt file-system-info ( path -- file-system-info )
 M: winnt file-systems ( -- array )
     find-volumes [ volume>paths ] map
     concat [
-        [ file-system-info ]
+        [ (file-system-info) ]
         [ drop \ file-system-info new swap >>mount-point ] recover
     ] map ;
 
diff --git a/basis/math/vectors/specialization/specialization.factor b/basis/math/vectors/specialization/specialization.factor
index b8c179d9fd..acf8dada38 100644
--- a/basis/math/vectors/specialization/specialization.factor
+++ b/basis/math/vectors/specialization/specialization.factor
@@ -76,7 +76,7 @@ PREDICATE: vector-word < word vector-words key? ;
     dup "specializations" word-prop
     [ ] [ V{ } clone [ "specializations" set-word-prop ] keep ] ?if ;
 
-M: vector-word subwords specializations values ;
+M: vector-word subwords specializations values [ word? ] filter ;
 
 : add-specialization ( new-word signature word -- )
     specializations set-at ;
diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/basis/specialized-arrays/specialized-arrays-tests.factor
index 9ca356506e..19f98ff31f 100755
--- a/basis/specialized-arrays/specialized-arrays-tests.factor
+++ b/basis/specialized-arrays/specialized-arrays-tests.factor
@@ -2,7 +2,8 @@ IN: specialized-arrays.tests
 USING: tools.test alien.syntax specialized-arrays sequences
 specialized-arrays.int specialized-arrays.bool
 specialized-arrays.ushort alien.c-types accessors kernel
-specialized-arrays.char specialized-arrays.uint arrays combinators ;
+specialized-arrays.char specialized-arrays.uint
+specialized-arrays.float arrays combinators compiler ;
 
 [ t ] [ { 1 2 3 } >int-array int-array? ] unit-test
 
diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 494dc20c05..26cbafc0d5 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -129,8 +129,11 @@ CONSTANT: button-clicked-background COLOR: FactorDarkSlateBlue
     <border-button-state-pen> dup dup
     <button-pen> ;
 
+: border-button-label-theme ( gadget -- )
+    dup label? [ [ clone t >>bold? ] change-font ] when drop ;
+
 : border-button-theme ( gadget -- gadget )
-    dup children>> first font>> t >>bold? drop
+    dup children>> first border-button-label-theme
     horizontal >>orientation
     <border-button-pen> >>interior
     dup dup interior>> pen-pref-dim >>min-dim
diff --git a/extra/mason/child/child-tests.factor b/extra/mason/child/child-tests.factor
index 2d5a7c6635..e8e1a9e0e9 100644
--- a/extra/mason/child/child-tests.factor
+++ b/extra/mason/child/child-tests.factor
@@ -33,7 +33,7 @@ USING: mason.child mason.config tools.test namespaces io kernel sequences ;
     ] with-scope
 ] unit-test
 
-[ { "./factor.com" "-i=boot.x86.32.image" "-no-user-init" } ] [
+[ { "./factor.com" "-i=boot.x86.32.image" "-no-user-init" "-sse-version=30" } ] [
     [
         "winnt" target-os set
         "x86.32" target-cpu set