diff --git a/extra/fjsc/fjsc.factor b/extra/fjsc/fjsc.factor
index 6beb48e05e..3821ac46b3 100755
--- a/extra/fjsc/fjsc.factor
+++ b/extra/fjsc/fjsc.factor
@@ -37,18 +37,15 @@ C: <ast-hashtable> ast-hashtable
 
 : identifier-middle? ( ch -- bool )
   [ blank? not ] keep
-  [ CHAR: } = not ] keep
-  [ CHAR: ] = not ] keep
-  [ CHAR: ;" = not ] keep
-  [ CHAR: " = not ] keep
+  [ "}];\"" member? not ] keep
   digit? not
-  and and and and and ;
+  and and ;
 
 MEMO: 'identifier-ends' ( -- parser )
   [
     [ blank? not ] keep
     [ CHAR: " = not ] keep
-    [ CHAR: ;" = not ] keep
+    [ CHAR: ; = not ] keep
     [ LETTER? not ] keep
     [ letter? not ] keep
     identifier-middle? not
diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor
old mode 100644
new mode 100755
index 895efc59dc..0aca30c4db
--- a/extra/id3/id3.factor
+++ b/extra/id3/id3.factor
@@ -3,7 +3,7 @@
 !
 
 USING: arrays combinators io io.binary io.files io.paths
-io.utf16 kernel math math.parser namespaces sequences
+io.encodings.utf16 kernel math math.parser namespaces sequences
 splitting strings assocs unicode.categories ;
 
 IN: id3
diff --git a/extra/optimizer/report/report.factor b/extra/optimizer/report/report.factor
index 6655d9dcf3..feaace9808 100755
--- a/extra/optimizer/report/report.factor
+++ b/extra/optimizer/report/report.factor
@@ -1,13 +1,13 @@
 IN: optimizer.report
 USING: assocs words sequences arrays compiler tools.time
 io.styles io prettyprint vocabs kernel sorting generator
-optimizer ;
+optimizer math ;
 
 : count-optimization-passes ( nodes n -- n )
     >r optimize-1
     [ r> 1+ count-optimization-passes ] [ drop r> ] if ;
 
-: word-table
+: results
     [ [ second ] swap compose compare ] curry sort 20 tail*
     print
     standard-table-style
diff --git a/extra/tools/disassembler/disassembler.factor b/extra/tools/disassembler/disassembler.factor
index 8fe3b9bdf0..147c307a32 100755
--- a/extra/tools/disassembler/disassembler.factor
+++ b/extra/tools/disassembler/disassembler.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io.files io words alien kernel math.parser alien.syntax
 io.launcher system assocs arrays sequences namespaces qualified
-system math windows.kernel32 generator.fixup ;
+system math generator.fixup ;
 IN: tools.disassembler
 
 : in-file "gdb-in.txt" resource-path ;