diff --git a/Objective-J/CommonJS/lib/objective-j/compiler.js b/Objective-J/CommonJS/lib/objective-j/compiler.js
index f54d7a685..f5465e1a5 100644
--- a/Objective-J/CommonJS/lib/objective-j/compiler.js
+++ b/Objective-J/CommonJS/lib/objective-j/compiler.js
@@ -64,7 +64,7 @@ function compileWithResolvedFlags(aFilePath, objjcFlags, gccFlags)
     else
     {
         // GCC preprocess the file.
-        var gcc = OS.popen("gcc -E -x c -P " + (gccFlags ? gccFlags.join(" ") : "") + " " + aFilePath),
+        var gcc = OS.popen("gcc -E -x c -P " + (gccFlags ? gccFlags.join(" ") : "") + " " + OS.enquote(aFilePath)),
             chunk = "";
 
         while (chunk = gcc.stdout.read())
diff --git a/Objective-J/Runtime/file.js b/Objective-J/Runtime/file.js
index f705a1fcf..d8f006013 100644
--- a/Objective-J/Runtime/file.js
+++ b/Objective-J/Runtime/file.js
@@ -34,7 +34,7 @@ var userAgent = window.navigator.userAgent;
 
 if (userAgent.indexOf("MSIE 7") !== -1)
     OBJJ_ENVIRONMENTS.unshift("IE7");
-if (userAgent.indexOf("MSIE 8") !== -1)
+else if (userAgent.indexOf("MSIE 8") !== -1)
     OBJJ_ENVIRONMENTS.unshift("IE8");
 else
     OBJJ_ENVIRONMENTS.unshift("W3C");
diff --git a/Tools/capp/Generate.j b/Tools/capp/Generate.j
index 9816a3529..6c777b5d8 100644
--- a/Tools/capp/Generate.j
+++ b/Tools/capp/Generate.j
@@ -73,7 +73,7 @@ function gen(/*va_args*/)
     else if (!FILE.exists(destinationProject))
     {
         // FIXME???
-        OS.system("cp -vR " + sourceTemplate + " " + destinationProject);
+        FILE.copyTree(sourceTemplate, destinationProject);
 
         var files = FILE.glob(FILE.join(destinationProject, "**", "*")),
             index = 0,