diff --git a/.appveyor.yml b/.appveyor.yml
index ead907ab8..f3a6cd180 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -53,7 +53,7 @@ environment:
 
 # scripts that run after cloning repository
 install:
-  - cmd: set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+  - cmd: set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%
   - cmd: xb.bat setup
 
 
diff --git a/xenia-build b/xenia-build
index 4aa233d57..52bf75b37 100755
--- a/xenia-build
+++ b/xenia-build
@@ -48,7 +48,7 @@ def main():
         if vs_version is None:
             print('ERROR: Visual Studio not found!')
             print('Please refer to the building guide:')
-            print('https://github.com/benvanik/xenia/blob/master/docs/building.md')
+            print('https://github.com/xenia-project/xenia/blob/master/docs/building.md')
             sys.exit(1)
 
     # Setup main argument parser and common arguments.
@@ -96,7 +96,7 @@ def import_vs_environment():
     install_path = None
     env_tool_args = None
 
-    vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -format json', shell=False, universal_newlines=True)
+    vswhere = subprocess.check_output('third_party/vswhere/vswhere.exe -version "[15,)" -latest -prerelease -format json -utf8', shell=False, universal_newlines=True)
     if vswhere:
         vswhere = json.loads(vswhere)
     if vswhere and len(vswhere) > 0: