diff --git a/basis/compiler/cfg/local/local.factor b/basis/compiler/cfg/local/local.factor
index bf336a8d2a..5d78397998 100644
--- a/basis/compiler/cfg/local/local.factor
+++ b/basis/compiler/cfg/local/local.factor
@@ -7,4 +7,4 @@ IN: compiler.cfg.local
     [ '[ live-in keys @ ] ] [ '[ _ change-instructions drop ] ] bi* bi ; inline
 
 : local-optimization ( cfg init-quot: ( live-in -- ) insn-quot: ( insns -- insns' ) -- cfg' )
-    [ dup ] 2dip '[ _ _ optimize-basic-block ] each-basic-block ;
+    [ dup ] 2dip '[ _ _ optimize-basic-block ] each-basic-block ; inline
\ No newline at end of file
diff --git a/basis/compiler/cfg/rpo/rpo.factor b/basis/compiler/cfg/rpo/rpo.factor
index c6ea2ee8b1..f6a40e17d0 100644
--- a/basis/compiler/cfg/rpo/rpo.factor
+++ b/basis/compiler/cfg/rpo/rpo.factor
@@ -1,8 +1,7 @@
 ! Copyright (C) 2008, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel accessors namespaces make math sequences sets
-assocs fry compiler.cfg compiler.cfg.instructions
-compiler.cfg.liveness ;
+assocs fry compiler.cfg compiler.cfg.instructions ;
 IN: compiler.cfg.rpo
 
 SYMBOL: visited
diff --git a/basis/compiler/cfg/two-operand/two-operand.factor b/basis/compiler/cfg/two-operand/two-operand.factor
index d5fb1e56cf..a3a83b9d14 100644
--- a/basis/compiler/cfg/two-operand/two-operand.factor
+++ b/basis/compiler/cfg/two-operand/two-operand.factor
@@ -15,12 +15,12 @@ IN: compiler.cfg.two-operand
 
 : make-copy/float ( dst src -- insn ) \ ##copy-float new-insn ; inline
 
-: convert-two-operand/integer ( insn -- insns )
+: convert-two-operand/integer ( insn -- )
     [ [ dst>> ] [ src1>> ] bi ##copy ]
     [ dup dst>> >>src1 , ]
     bi ; inline
 
-: convert-two-operand/float ( insn -- insns )
+: convert-two-operand/float ( insn -- )
     [ [ dst>> ] [ src1>> ] bi ##copy-float ]
     [ dup dst>> >>src1 , ]
     bi ; inline
diff --git a/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor b/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor
index c53a001d28..8653aaab04 100644
--- a/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor
+++ b/basis/compiler/cfg/value-numbering/rewrite/rewrite.factor
@@ -79,7 +79,7 @@ M: ##compare-imm-branch rewrite
     [ dst>> ]
     [ src2>> ]
     [ src1>> vreg>vn vn>constant ] tri
-    cc= f i \ ##compare-imm boa ;
+    cc= i \ ##compare-imm new-insn ;
 
 M: ##compare rewrite
     dup flip-comparison? [
diff --git a/basis/compiler/codegen/fixup/fixup.factor b/basis/compiler/codegen/fixup/fixup.factor
index 5520508788..d44f6afd99 100755
--- a/basis/compiler/codegen/fixup/fixup.factor
+++ b/basis/compiler/codegen/fixup/fixup.factor
@@ -82,7 +82,7 @@ SYMBOL: relocation-table
     dup resolve-offset neg add-literal
     [ rt-here ] dip [ class>> ] [ offset>> ] bi add-relocation-entry ;
 
-: resolve-relative-label ( label-fixup -- )
+: resolve-relative-label ( label-fixup -- label )
     [ class>> ] [ offset>> ] [ resolve-offset ] tri 3array ;
 
 : resolve-labels ( label-fixups -- labels' )