diff --git a/.appveyor.yml b/.appveyor.yml
index 8a5d4c7..09573f3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,12 +9,12 @@ environment:
   global:
     # Appveyor doesn't have Qt 12 yet
     LatestLTSQtVersion: 5.9
-    LatestQtVersion 5.11
+    LatestQtVersion: 5.11
   matrix:
     # Latest version of Qt, dll, 64bit, MSVC 2015, qmake
   - QT5: C:\Qt\%LatestQtVersion%\msvc2015_64
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: amd64
+    targetPlatform: amd64
     use_mingw: "false"
     use_static: "false"
     use_cmake: "false"
@@ -24,14 +24,14 @@ environment:
     # LTS version of Qt, dll, 32bit, MSVC 2015, qmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: x86
+    targetPlatform: x86
     use_mingw: "false"
     use_static: "false"
     use_cmake: "false"
     # LTS version of Qt, dll, 32bit, MSVC 2015, cmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: x86
+    targetPlatform: x86
     use_mingw: "false"
     use_static: "false"
     use_cmake: "true"
@@ -40,14 +40,14 @@ environment:
     # LTS version of Qt, static, 32bit, MSVC 2015, qmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: x86
+    targetPlatform: x86
     use_mingw: "false"
     use_static: "true"
     use_cmake: "false"
     # LTS version of Qt, static, 32bit, MSVC 2015, cmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: x86
+    targetPlatform: x86
     use_mingw: "false"
     use_static: "true"
     use_cmake: "true"
@@ -58,14 +58,14 @@ environment:
     # LTS version of Qt, dll, 32bit, MinGW, qmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
     COMPILER: C:\Qt\Tools\mingw530_32
-    platform: x86
+    targetPlatform: x86
     use_mingw: "true"
     use_static: "false"
     use_cmake: "false"
     # LTS version of Qt, dll, 32bit, MinGW, cmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
     COMPILER: C:\Qt\Tools\mingw530_32
-    platform: x86
+    targetPlatform: x86
     use_mingw: "true"
     use_static: "false"
     use_cmake: "true"
@@ -74,14 +74,14 @@ environment:
     # LTS version of Qt, static, 32bit, MinGW, qmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
     COMPILER: C:\Qt\Tools\mingw530_32
-    platform: x86
+    targetPlatform: x86
     use_mingw: "true"
     use_static: "true"
     use_cmake: "false"
     # LTS version of Qt, static, 32bit, MinGW, cmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\mingw53_32
     COMPILER: C:\Qt\Tools\mingw530_32
-    platform: x86
+    targetPlatform: x86
     use_mingw: "true"
     use_static: "true"
     use_cmake: "true"
@@ -94,14 +94,14 @@ environment:
     # LTS version of Qt, dll, 64bit, MSVC 2015, qmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: amd64
+    targetPlatform: amd64
     use_mingw: "false"
     use_static: "false"
     use_cmake: "false"
     # LTS version of Qt, dll, 64bit, MSVC 2015, cmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: amd64
+    targetPlatform: amd64
     use_mingw: "false"
     use_static: "false"
     use_cmake: "true"
@@ -110,14 +110,14 @@ environment:
     # LTS version of Qt, static, 64bit, MSVC 2015, qmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: amd64
+    targetPlatform: amd64
     use_mingw: "false"
     use_static: "true"
     use_cmake: "false"
     # LTS version of Qt, static, 64bit, MSVC 2015, cmake
   - QT5: C:\Qt\%LatestLTSQtVersion%\msvc2015_64
     COMPILER: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC
-    platform: amd64
+    targetPlatform: amd64
     use_mingw: "false"
     use_static: "true"
     use_cmake: "true"
@@ -130,8 +130,10 @@ matrix:
 
 before_build:
 - set PATH=%COMPILER%\bin;%QT5%\bin;%PATH%
+- set originalWD=%CD%
 - call "%QT5%\bin\qtenv2.bat"
-- if not %use_mingw%==true call "%COMPILER%\vcvarsall.bat" %platform%
+- cd %originalWD%
+- if %use_mingw%==false call "%COMPILER%\vcvarsall.bat" %targetPlatform%
 - if %use_static%==true (set USESTATIC=ON) else (set USESTATIC=OFF)
 - if %use_mingw%==true (set CMAKEGENERATOR="MinGW Makefiles") else (set CMAKEGENERATOR="NMake Makefiles")
 - if %use_mingw%==true (set MAKEENGINE=mingw32-make) else (set MAKEENGINE=nmake)
@@ -147,8 +149,8 @@ build_script:
 - if %use_cmake%==true cmake -G %CMAKEGENERATOR% -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_EXAMPLES=ON -DBUILD_STATIC=%USESTATIC% -DCMAKE_INSTALL_PREFIX="./installed" ../
 - if %use_cmake%==true cmake --build .
 - if %use_cmake%==true cmake --build . --target install
-- if %use_cmake%==false %use_static%==true qmake "CONFIG+=adsBuildStatic"
-- if %use_cmake%==false %use_static%==false qmake
+- if %use_cmake%==false if %use_static%==true qmake "CONFIG+=adsBuildStatic"
+- if %use_cmake%==false if %use_static%==false qmake
 - if %use_cmake%==false %MAKEENGINE% debug
 - if %use_cmake%==false %MAKEENGINE% release
 - if %use_cmake%==false %MAKEENGINE% install