diff --git a/Tools/press/main.j b/Tools/press/main.j
index f92270a50..3ea3bcd47 100644
--- a/Tools/press/main.j
+++ b/Tools/press/main.j
@@ -1,9 +1,4 @@
-var OS = require("os");
-if (system.engine !== "rhino") {
-    system.args.splice(1,2); // remove library path and main.j
-    var cmd = "NARWHAL_ENGINE_HOME='' NARWHAL_ENGINE='rhino' " + system.args.map(OS.enquote).join(" ");
-    OS.exit(OS.system(cmd));
-}
+require("narwhal").ensureEngine("rhino");
 
 @import <Foundation/Foundation.j>
 
diff --git a/Tools/press/objj-analysis-tools.j b/Tools/press/objj-analysis-tools.j
index 344148bc8..24b6e9a8f 100644
--- a/Tools/press/objj-analysis-tools.j
+++ b/Tools/press/objj-analysis-tools.j
@@ -272,9 +272,9 @@ function findGlobalDefines(context, mainPath, evaledFragments, bundleCallback)
                 bundlePaths = bundlePaths || [];
 
                 // load default theme bundle
-                var themePath = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName]];
-                var themeBundle = [[CPBundle alloc] initWithPath:themePath + "/Info.plist"];
-                [themeBundle loadWithDelegate:bundleDelegate];
+                // var themePath = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName]];
+                // var themeBundle = [[CPBundle alloc] initWithPath:themePath + "/Info.plist"];
+                // [themeBundle loadWithDelegate:bundleDelegate];
 
                 // load additional bundles
                 bundlePaths.forEach(function(bundlePath) {