diff --git a/CefSharp.Core/CefSharp.Core.vcxproj b/CefSharp.Core/CefSharp.Core.vcxproj
index 0595589bda..07462f0f61 100644
--- a/CefSharp.Core/CefSharp.Core.vcxproj
+++ b/CefSharp.Core/CefSharp.Core.vcxproj
@@ -250,7 +250,7 @@
     <ClInclude Include="Internals\MCefRefPtr.h" />
     <ClInclude Include="Internals\RenderClientAdapter.h" />
     <ClInclude Include="Internals\StringVisitor.h" />
-	<ClInclude Include="PaintElementType.h" />
+    <ClInclude Include="PaintElementType.h" />
     <ClInclude Include="MouseButtonType.h" />
     <ClInclude Include="ManagedCefBrowserAdapter.h" />
     <ClInclude Include="CefSettings.h" />
diff --git a/CefSharp.Core/ManagedCefBrowserAdapter.h b/CefSharp.Core/ManagedCefBrowserAdapter.h
index ccecf1326d..ee95ecf0f4 100644
--- a/CefSharp.Core/ManagedCefBrowserAdapter.h
+++ b/CefSharp.Core/ManagedCefBrowserAdapter.h
@@ -127,15 +127,15 @@ namespace CefSharp
             }
         }
 
-		void Invalidate(PaintElementType type)
-		{
-			auto cefHost = _renderClientAdapter->TryGetCefHost();
+        void Invalidate(PaintElementType type)
+        {
+            auto cefHost = _renderClientAdapter->TryGetCefHost();
 
-			if (cefHost != nullptr)
-			{
-				cefHost->Invalidate((CefBrowserHost::PaintElementType)type);
-			}
-		}
+            if (cefHost != nullptr)
+            {
+                cefHost->Invalidate((CefBrowserHost::PaintElementType)type);
+            }
+        }
 
         void SendFocusEvent(bool isFocused)
         {
@@ -202,7 +202,7 @@ namespace CefSharp
         void OnMouseButton(int x, int y, MouseButtonType mouseButtonType, bool mouseUp, int clickCount, CefEventFlags modifiers)
         {
             auto cefHost = _renderClientAdapter->TryGetCefHost();
-			
+
             if (cefHost != nullptr)
             {
                 CefMouseEvent mouseEvent;
diff --git a/CefSharp.Core/MouseButtonType.h b/CefSharp.Core/MouseButtonType.h
index 5add4099bc..2a84dc7f0a 100644
--- a/CefSharp.Core/MouseButtonType.h
+++ b/CefSharp.Core/MouseButtonType.h
@@ -10,7 +10,6 @@ namespace CefSharp
     {
         Left = CefBrowserHost::MouseButtonType::MBT_LEFT,
         Middle = CefBrowserHost::MouseButtonType::MBT_MIDDLE,
-        Right = CefBrowserHost::MouseButtonType::MBT_RIGHT,
-		Blabla
+        Right = CefBrowserHost::MouseButtonType::MBT_RIGHT
     };
 }
\ No newline at end of file
diff --git a/CefSharp.Core/PaintElementType.h b/CefSharp.Core/PaintElementType.h
index dd6481ce4b..d382ddc47b 100644
--- a/CefSharp.Core/PaintElementType.h
+++ b/CefSharp.Core/PaintElementType.h
@@ -1,4 +1,4 @@
-// Copyright © 2010-2014 The CefSharp Authors. All rights reserved.
+// Copyright (c) 2010-2014 The CefSharp Authors. All rights reserved.
 //
 // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
 
@@ -6,9 +6,9 @@
 
 namespace CefSharp
 {
-	public enum class PaintElementType
-	{
-		View = CefBrowserHost::PaintElementType::PET_VIEW,
-		Popup = CefBrowserHost::PaintElementType::PET_POPUP
-	};
+    public enum class PaintElementType
+    {
+        View = CefBrowserHost::PaintElementType::PET_VIEW,
+        Popup = CefBrowserHost::PaintElementType::PET_POPUP
+    };
 }
\ No newline at end of file
diff --git a/CefSharp.Wpf/ChromiumWebBrowser.cs b/CefSharp.Wpf/ChromiumWebBrowser.cs
index fd5e7cc1c9..e1533b42f3 100644
--- a/CefSharp.Wpf/ChromiumWebBrowser.cs
+++ b/CefSharp.Wpf/ChromiumWebBrowser.cs
@@ -509,9 +509,6 @@ private void OnIsVisibleChanged(object sender, DependencyPropertyChangedEventArg
 
             var isVisible = (bool)args.NewValue;
             managedCefBrowserAdapter.WasHidden(!isVisible);
-
-            if (isVisible)
-                managedCefBrowserAdapter.Invalidate(PaintElementType.View);
         }
 
         private static void OnApplicationExit(object sender, ExitEventArgs e)
@@ -1291,5 +1288,13 @@ public void AddWordToDictionary(string word)
             managedCefBrowserAdapter.AddWordToDictionary(word);
         }
 
+        // Invalidate the view. The browser will call CefRenderHandler::OnPaint
+        // asynchronously. This method is only used when window rendering is
+        // disabled.
+        public void Invalidate(PaintElementType type)
+        {
+            managedCefBrowserAdapter.Invalidate(type);
+        }
+
     }
 }
diff --git a/build.ps1 b/build.ps1
index cdb9effeea..696463bdcc 100644
--- a/build.ps1
+++ b/build.ps1
@@ -3,7 +3,7 @@ param(
     [Parameter(Position = 0)] 
     [string] $Target = "nupkg",
     [Parameter(Position = 1)]
-    [string] $Version = "39.0.0-pre01-MB3",
+    [string] $Version = "39.0.0-pre01",
     [Parameter(Position = 2)]
     [string] $AssemblyVersion = "39.0.0",
     [Parameter(Position = 3)]
@@ -284,8 +284,8 @@ WriteAssemblyVersion
 switch -Exact ($Target) {
     "nupkg"
     {
-        VSX v120
-        #VSX v110
+        #VSX v120
+        VSX v110
         Nupkg
     }
     "nupkg-only"