diff --git a/.travis.yml b/.travis.yml
index 119c5f5..91db5d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ matrix:
         - libglew-dev
   - compiler: clang
     os: osx
-    osx_image: xcode9.1
+    osx_image: xcode9.4
     env:
     - OGRE_ENABLED=0
     - GSAGE_VERSION_BUILD=${TRAVIS_BUILD_NUMBER}
diff --git a/README.md b/README.md
index b894f40..a29e116 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ You can read more documentation on [http://engine.readthedocs.io/](http://engine
 
 This engine supports three OS at the moment:
 * Windows, Visual Studio 2017 and later.
-* OSX, ci is using Xcode 9.1.
+* OSX, ci is using Xcode 9.4.
 * Linux, ci is using Ubuntu 16.04 with GCC 5.4.
 
 There are plans to support iOS and Android.
diff --git a/resources/scripts/editor/projectManager.lua b/resources/scripts/editor/projectManager.lua
index 6507f05..dd9ab75 100644
--- a/resources/scripts/editor/projectManager.lua
+++ b/resources/scripts/editor/projectManager.lua
@@ -308,7 +308,7 @@ function ProjectManager:create(settings, onProgress, onComplete)
     end
     message(msg, color)
 
-    if percent == 100 then
+    if percent >= 99.9 then
       finalize(true)
     end
   end
@@ -337,7 +337,7 @@ function ProjectManager:create(settings, onProgress, onComplete)
     message(msg, color)
     percent = percent + step / filecount
 
-    if percent == 100 then
+    if percent >= 99.9 then
       finalize(true)
     end
   end
diff --git a/resources/scripts/imgui/projectWizard.lua b/resources/scripts/imgui/projectWizard.lua
index cd8f5db..4438e47 100644
--- a/resources/scripts/imgui/projectWizard.lua
+++ b/resources/scripts/imgui/projectWizard.lua
@@ -11,7 +11,7 @@ ProjectWizard = class(ImguiWindow, function(self, textureID, title, open)
 
   local state = editor:getGlobalState()
   self.fileDialogState = state.fileDialogState or {}
-  local dialogFolder = self.fileDialogState.folder or os.getenv("HOME")
+  local dialogFolder = self.fileDialogState.folder or fs.path.homedir()
   local recent = projectManager:getRecentProjects(5)
   self.data = {
     wizard = core.settings.projectWizard,
@@ -168,7 +168,7 @@ function ProjectWizard:runCreationFlow(project)
     end
 
     pageData.settings = {
-      projectPath = fileDialogState.folder or os.getenv("HOME"),
+      projectPath = fileDialogState.folder or fs.path.homedir(),
       projectName = projectType .. " project",
       projectType = projectType,
       resources = template.resources,
diff --git a/resources/scripts/lib/filesystem.lua b/resources/scripts/lib/filesystem.lua
index d49d09a..d213252 100644
--- a/resources/scripts/lib/filesystem.lua
+++ b/resources/scripts/lib/filesystem.lua
@@ -25,6 +25,9 @@ local fs = {
     end,
     exists = function(path)
       return cfs:exists(path)
+    end,
+    homedir = function(path)
+      return os.getenv("HOME") or os.getenv("USERPROFILE")
     end
   },
   rmdir = function(path, recursive)