diff --git a/library/bootstrap/boot-stage1.factor b/library/bootstrap/boot-stage1.factor
index e53f2afca3..f8bf7416fd 100644
--- a/library/bootstrap/boot-stage1.factor
+++ b/library/bootstrap/boot-stage1.factor
@@ -10,10 +10,10 @@ sequences vectors words ;
 "/library/bootstrap/primitives.factor" run-resource
 
 : parse-resource* ( path -- )
-    [ parse-resource ] catch [
+    [ parse-resource ] [
         { { "Parse file again" t } } condition drop
         parse-resource*
-    ] when* ;
+    ] recover ;
 
 : if-arch ( arch seq -- )
     architecture get rot member?
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index fbf25f4f94..17f0155052 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -84,6 +84,6 @@ parser sequences sequences-internals words ;
     "Now, you can run ./f factor.image" print flush
     
     "factor.image" resource-path save-image
-] catch [ print-error listener ] when*
+] [ print-error listener ] recover
 
 0 exit
diff --git a/library/ui/tools/help.factor b/library/ui/tools/help.factor
index 5966d3d7a9..8c06d7fd97 100644
--- a/library/ui/tools/help.factor
+++ b/library/ui/tools/help.factor
@@ -22,7 +22,7 @@ TUPLE: help-gadget history ;
     [
         "Back" [ history-action go-back ] <bevel-button> ,
         "Forward" [ history-action go-forward ] <bevel-button> ,
-        "Home" [ history-action go-home ] <bevel-button> ,
+        "Home" [ find-help-gadget go-home ] <bevel-button> ,
     ] make-toolbar ;
 
 : <help-pane> ( -- gadget )
diff --git a/library/windows/ui.factor b/library/windows/ui.factor
index 3a373ab8cb..536a647f72 100644
--- a/library/windows/ui.factor
+++ b/library/windows/ui.factor
@@ -196,7 +196,7 @@ SYMBOL: hWnd
 
                 { [ t ] [ drop DefWindowProc ] }
             } cond
-        ] catch [ error. 0 ] when*
+        ] [ error. 0 ] recover
      ] alien-callback ;
 
 : event-loop ( -- )