diff --git a/PanoPainter.vcxproj b/PanoPainter.vcxproj
index 8fd034d..0a287ac 100644
--- a/PanoPainter.vcxproj
+++ b/PanoPainter.vcxproj
@@ -42,7 +42,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
diff --git a/PanoPainterPackage/PanoPainterPackage.wapproj b/PanoPainterPackage/PanoPainterPackage.wapproj
index 192e1dd..b64e9e1 100644
--- a/PanoPainterPackage/PanoPainterPackage.wapproj
+++ b/PanoPainterPackage/PanoPainterPackage.wapproj
@@ -41,7 +41,7 @@
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
   <PropertyGroup>
     <ProjectGuid>3a716fb6-de62-439f-83b6-3c40915d6678</ProjectGuid>
-    <TargetPlatformVersion>10.0.17134.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <PackageCertificateKeyFile>PanoPainterPackage_StoreKey.pfx</PackageCertificateKeyFile>
diff --git a/src/main.cpp b/src/main.cpp
index 9792c51..d5fc52d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -441,7 +441,7 @@ void init_vk_map()
                 }
                 else
                 {
-                    LOG("KEY MAP COLLISION %d and %d maps to", 
+                    LOG("KEY MAP COLLISION %d and %d maps to %d", 
                         (int)vk, (int)vkey_map[(kKey)k], (int)k);
                 }
             }
@@ -513,13 +513,13 @@ bool win32_vr_start()
         };
 
         const float target_tick_rate = 90;
-        auto t0 = GetTickCount();
+        auto t0 = GetTickCount64();
         float one_sec_timer = 0;
         int frames = 0;
         while (vr_running && running == 1 && vive->Valid())
         {
             std::unique_lock<std::mutex> lock(hmd_render_mutex);
-            auto t1 = GetTickCount();
+            auto t1 = GetTickCount64();
             float dt = (float)(t1 - t0) / 1000.0f;
 
             one_sec_timer += dt;
@@ -896,7 +896,7 @@ int main(int argc, char** argv)
         LOG("start render thread");
         const float target_fps = 10;
         const float target_tick_rate = 60;
-        unsigned long t0 = GetTickCount();
+        unsigned long t0 = GetTickCount64();
         unsigned long t1;
         bool first_frame = true;
         int frames = 0;
@@ -905,7 +905,7 @@ int main(int argc, char** argv)
         float frame_timer = 0;
         while(running == 1)
         {
-            t1 = GetTickCount();
+            t1 = GetTickCount64();
             float dt = (float)(t1 - t0) / 1000.0f;
             one_sec += dt;
             render_timer += dt;
@@ -1424,13 +1424,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 
 int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
 {
-    LPWSTR *wargs = nullptr;
-    char** argv = nullptr;
     int argc = 0;
 
     // convert args from char to wchar
-    wargs = CommandLineToArgvW(GetCommandLine(), &argc);
-    argv = new char*[argc + 1];
+    auto wargs = CommandLineToArgvW(GetCommandLine(), &argc);
+    auto argv = new char*[argc + 1];
     for (int i = 0; i < argc; i++)
     {
         auto len = wcslen(wargs[i]) + 1;