diff --git a/cmake/modules/FindFBX.cmake b/cmake/modules/FindFBX.cmake
index 2e84d1ea19..9a1d08a010 100644
--- a/cmake/modules/FindFBX.cmake
+++ b/cmake/modules/FindFBX.cmake
@@ -56,19 +56,17 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 endif()
 
 function(_fbx_find_library _name _lib _suffix)
-  if (MSVC12)
+  if (MSVC_VERSION EQUAL 1910)
+    set(VS_PREFIX vs2017)
+  elseif (MSVC_VERSION EQUAL 1900)
+    set(VS_PREFIX vs2015)
+  elseif (MSVC_VERSION EQUAL 1800)
     set(VS_PREFIX vs2013)
-  endif()
-
-  if (MSVC11)
+  elseif (MSVC_VERSION EQUAL 1700)
     set(VS_PREFIX vs2012)
-  endif()
-
-  if (MSVC10)
+  elseif (MSVC_VERSION EQUAL 1600)
     set(VS_PREFIX vs2010)
-  endif()
-
-  if (MSVC90)
+  elseif (MSVC_VERSION EQUAL 1500)
     set(VS_PREFIX vs2008)
   endif()
 
diff --git a/tools/oven/src/Oven.cpp b/tools/oven/src/Oven.cpp
index dc763cc82d..d0b8c3cd65 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -61,7 +61,9 @@ Oven::Oven(int argc, char* argv[]) :
     if (parser.isSet(CLI_INPUT_PARAMETER) || parser.isSet(CLI_OUTPUT_PARAMETER)) {
         if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) {
             BakerCLI* cli = new BakerCLI(this);
-            cli->bakeFile(parser.value(CLI_INPUT_PARAMETER), parser.value(CLI_OUTPUT_PARAMETER));
+            QUrl inputUrl(QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)));
+            QUrl outputUrl(QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER)));
+            cli->bakeFile(inputUrl, outputUrl.toString());
         } else {
             parser.showHelp();
             QApplication::quit();