diff --git a/NuGet/CefSharp.Common.nuspec b/NuGet/CefSharp.Common.nuspec
index 6f5c95a052..86e76cab84 100644
--- a/NuGet/CefSharp.Common.nuspec
+++ b/NuGet/CefSharp.Common.nuspec
@@ -17,7 +17,7 @@
 </metadata>
   <files>
     <!-- Common CefSharp stuff (shared between both WPF and WinForms) -->
-    <file src="..\*\Release\CefSharp.Core.dll" target="CefSharp\$Platform$"/>
+    <file src="CefSharp.Core.dll" target="CefSharp\$Platform$"/>
     <file src="..\CefSharp\bin\$Platform$\Release\CefSharp.dll" target="CefSharp\$Platform$"/>
     <file src="..\CefSharp.BrowserSubprocess\bin\$Platform$\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\$Platform$"/>
 
diff --git a/NuGet/pack.bat b/NuGet/pack.bat
index 30668ca311..633a4e3baa 100644
--- a/NuGet/pack.bat
+++ b/NuGet/pack.bat
@@ -1,8 +1,15 @@
-set version=31.0.0-pre1a
+set version=31.0.0-pre1b
 REM set platform=x86
 rem NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=
-NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=.%Platform%;Platform=%Platform%
-rem NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=
-rem NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=.x86
-NuGet pack CefSharp.WpfOrWinForms.nuspec -NoPackageAnalysis -Version %version% -Properties ControlType=Wpf;DotPlatform=.%Platform%;Platform=%Platform%
-NuGet pack CefSharp.WpfOrWinForms.nuspec -NoPackageAnalysis -Version %version% -Properties ControlType=WinForms;DotPlatform=.%Platform%;Platform=%Platform%
+
+if "%platform%"=="x64" (
+	copy ..\x86\Release\CefSharp.Core.dll
+	set DotPlatform=.x64
+) else (
+	copy ..\Win32\Release\CefSharp.Core.dll
+	set DotPlatform=
+)
+
+NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=%DotPlatform%;Platform=%Platform%
+NuGet pack CefSharp.WpfOrWinForms.nuspec -NoPackageAnalysis -Version %version% -Properties ControlType=Wpf;DotPlatform=%DotPlatform%;Platform=%Platform%
+NuGet pack CefSharp.WpfOrWinForms.nuspec -NoPackageAnalysis -Version %version% -Properties ControlType=WinForms;DotPlatform=%DotPlatform%;Platform=%Platform%
diff --git a/appveyor.yml b/appveyor.yml
index 4a395af4c4..4879246bf8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,9 +9,7 @@ configuration:
 
 platform:
   - x64
-  -
   - Win32
-  - x86
 
 before_build:
   - cmd: nuget restore
@@ -36,10 +34,3 @@ after_test:
 
 artifacts:
   - path: NuGet\*.nupkg
-
-matrix:
-  allow_failures:
-    - platform: Win32
-      configuration: Release
-    - platform: x86
-      configuration: Release