diff --git a/Tools/press/Rakefile b/Tools/press/Rakefile
index 4dad5dc5a..7ad3bb251 100644
--- a/Tools/press/Rakefile
+++ b/Tools/press/Rakefile
@@ -10,8 +10,9 @@ $PRODUCT = :press
 $BUILD_PATH = File.join($BUILD_DIR, $CONFIGURATION, 'press')
 $ENVIRONMENT_BIN_PRODUCT = File.join($ENVIRONMENT_BIN_DIR, 'press')
 $ENVIRONMENT_LIB_PRODUCT = File.join($ENVIRONMENT_LIB_DIR, 'press')
+$ENVIRONMENT_BRIDGE = File.join($ENVIRONMENT_LIB_DIR, 'press', 'bridge.js')
 
-task :build => [:press, $ENVIRONMENT_BIN_PRODUCT, $ENVIRONMENT_LIB_PRODUCT]
+task :build => [:press, $ENVIRONMENT_BIN_PRODUCT, $ENVIRONMENT_LIB_PRODUCT, $ENVIRONMENT_BRIDGE]
 
 # Debug Framework
 ObjectiveJ::BundleTask.new(:press) do |t|
@@ -36,3 +37,7 @@ end
 file_d $ENVIRONMENT_LIB_PRODUCT => [:press] do
     cp_r(File.join($BUILD_PATH, '.'), $ENVIRONMENT_LIB_PRODUCT)
 end
+
+file_d $ENVIRONMENT_BRIDGE => [File.join($HOME_DIR, 'Tools', 'Utilities', 'bridge.js')] do
+    cp(File.join($HOME_DIR, 'Tools', 'Utilities', 'bridge.js'), $ENVIRONMENT_BRIDGE)
+end
diff --git a/Tools/press/main.j b/Tools/press/main.j
index ed96f4536..a6d047258 100644
--- a/Tools/press/main.j
+++ b/Tools/press/main.j
@@ -563,5 +563,3 @@ function outputTransformer(os, document, encoding, standalone)
 
 	String(serializer.transform(domSource, streamResult));
 }
-
-main();
diff --git a/Tools/press/objj-analysis-tools.j b/Tools/press/objj-analysis-tools.j
index c225998fc..7ab43627f 100644
--- a/Tools/press/objj-analysis-tools.j
+++ b/Tools/press/objj-analysis-tools.j
@@ -1,5 +1,5 @@
-var objjPath    = OBJJ_LIB+'/Frameworks-Rhino/Objective-J/Objective-J.js',
-    bridgePath  = OBJJ_LIB+'/bridge.js',
+var objjPath    = OBJJ_HOME+'/lib/Frameworks/Objective-J/rhino.platform/Objective-J.js',
+    bridgePath  = OBJJ_HOME+'/lib/press/bridge.js',
     envPath     = "/Users/tlrobinson/280North/git/cappuccino/Tools/press/env.js";
     
 /*
@@ -83,7 +83,7 @@ function traverseDependencies(context, file)
             var token;
             while (token = lexer.skip_whitespace())
             {
-                if (context.dependencies[token])
+                if (context.dependencies.hasOwnProperty(token))
                 {
                     var files = context.dependencies[token];
                     for (var j = 0; j < files.length; j++)
@@ -153,7 +153,7 @@ function traverseDependencies(context, file)
             if (context.referenceCallback)
                 context.referenceCallback(file.path, referencedFile, referencedFiles[referencedFile]);
                 
-            if (context.scope.objj_files[referencedFile])
+            if (context.scope.objj_files.hasOwnProperty(referencedFile))
                 traverseDependencies(context, context.scope.objj_files[referencedFile]);
             else
                 CPLog.error("Missing referenced file: " + referencedFile);