diff --git a/Source/Project64-input/CProject64Input.cpp b/Source/Project64-input/CProject64Input.cpp
index 001e87be7..37f7c5950 100644
--- a/Source/Project64-input/CProject64Input.cpp
+++ b/Source/Project64-input/CProject64Input.cpp
@@ -41,7 +41,7 @@ void CProject64Input::InitiateControllers(CONTROL_INFO * ControlInfo)
     }
     m_DirectInput->Initiate(ControlInfo);
     m_iFirstController = -1;
-    for (size_t i = 0, n = sizeof(m_Controllers) / sizeof(m_Controllers[0]); i < n; i++)
+    for (uint32_t i = 0, n = sizeof(m_Controllers) / sizeof(m_Controllers[0]); i < n; i++)
     {
         g_Settings->LoadController(i, m_ControlInfo.Controls[i], m_Controllers[i]);
         m_DirectInput->MapControllerDevice(m_Controllers[i]);
diff --git a/Source/Project64-input/InputConfigUI.cpp b/Source/Project64-input/InputConfigUI.cpp
index 7c8ef0333..3fd7fcf3e 100644
--- a/Source/Project64-input/InputConfigUI.cpp
+++ b/Source/Project64-input/InputConfigUI.cpp
@@ -409,7 +409,7 @@ void CInputConfigUI::UpdateDeviceMapping(void)
         &m_pgController3
     };
 
-    for (size_t i = 0, n = GetPageCount(); i < n; i++)
+    for (uint32_t i = 0, n = GetPageCount(); i < n; i++)
     {
         HWND hPage = IndexToHwnd(i);
         if (hPage != nullptr && i < (sizeof(Pages) / sizeof(Pages[0])))
diff --git a/Source/Project64-input/OptionsUI.cpp b/Source/Project64-input/OptionsUI.cpp
index f33243d2b..d8c3d523c 100644
--- a/Source/Project64-input/OptionsUI.cpp
+++ b/Source/Project64-input/OptionsUI.cpp
@@ -68,10 +68,10 @@ public:
         }
 
         CComboBox ControllerPak(GetDlgItem(IDC_PAKTYPE));
-        int32_t Pak = ControllerPak.GetItemData(ControllerPak.GetCurSel());
+        DWORD_PTR Pak = ControllerPak.GetItemData(ControllerPak.GetCurSel());
         if (Pak != m_ControlInfo.Plugin)
         {
-            m_ControlInfo.Plugin = Pak;
+            m_ControlInfo.Plugin = (Pak & 0xFFFFFFFF);
             bChanged = true;
         }
 
diff --git a/Source/Project64-input/Project64-input.vcxproj b/Source/Project64-input/Project64-input.vcxproj
index 80faa8e10..d9a397a92 100644
--- a/Source/Project64-input/Project64-input.vcxproj
+++ b/Source/Project64-input/Project64-input.vcxproj
@@ -46,14 +46,10 @@
       <Command>"$(SolutionDir)Source\Script\UpdateVersion.cmd" "$(Configuration)" "$(Platform)" "$(SolutionDir)Source\Project64-input\Version.h.in" "$(SolutionDir)Source\Project64-input\Version.h"</Command>
     </PreBuildEvent>
     <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <Link>
-      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ImageHasSafeExceptionHandlers>
+      <AdditionalDependencies>dinput8.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(Root)Source\3rdParty\directx\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(Root)Source\3rdParty\directx\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/Source/Project64-input/wtl-BitmapPicture.cpp b/Source/Project64-input/wtl-BitmapPicture.cpp
index 6c1d80b2b..8eca655c8 100644
--- a/Source/Project64-input/wtl-BitmapPicture.cpp
+++ b/Source/Project64-input/wtl-BitmapPicture.cpp
@@ -55,7 +55,7 @@ bool CBitmapPicture::SetIcon(LPCWSTR lpszResourceName, uint32_t nWidth, uint32_t
 	}
 	if (IS_INTRESOURCE(lpszResourceName))
 	{
-		m_nResourceID = (int)lpszResourceName;
+		m_nResourceID = (((DWORD_PTR)lpszResourceName) & 0xFFFF);
 	}
 	else
 	{
@@ -77,7 +77,7 @@ void CBitmapPicture::SetBitmap(LPCWSTR lpszResourceName)
 {
     if (IS_INTRESOURCE(lpszResourceName))
     {
-        m_nResourceID = (int)lpszResourceName;
+        m_nResourceID = (((DWORD_PTR)lpszResourceName) & 0xFFFF);
     }
     else
     {