diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
index 6ad271d002..7c01d7d413 100644
--- a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
+++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
@@ -301,7 +301,7 @@ namespace CefSharp
             frame->SendProcessMessage(CefProcessId::PID_BROWSER, uncaughtExceptionMessage);
         }
 
-        JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, CefString& frameId)
+        JavascriptRootObjectWrapper^ CefAppUnmanagedWrapper::GetJsRootObjectWrapper(int browserId, CefString frameId)
         {
             auto rootObjectWrappers = _jsRootObjectWrappersByFrameId;
 
diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
index b989c3467a..f74891eaaf 100644
--- a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
+++ b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.h
@@ -85,7 +85,7 @@ namespace CefSharp
             }
 
             CefBrowserWrapper^ FindBrowserWrapper(int browserId);
-            JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, CefString& frameId);
+            JavascriptRootObjectWrapper^ GetJsRootObjectWrapper(int browserId, CefString frameId);
 
             virtual DECL CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() override;
             virtual DECL void OnBrowserCreated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDictionaryValue> extraInfo) override;
diff --git a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
index 12ce17ba47..37f03c1dd0 100644
--- a/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
+++ b/CefSharp.BrowserSubprocess.Core/CefBrowserWrapper.h
@@ -30,7 +30,7 @@ namespace CefSharp
             MCefRefPtr<CefBrowser> _cefBrowser;
 
         public:
-            CefBrowserWrapper(CefRefPtr<CefBrowser> cefBrowser)
+            CefBrowserWrapper(const CefRefPtr<CefBrowser> &cefBrowser)
             {
                 _cefBrowser = cefBrowser.get();
                 BrowserId = cefBrowser->GetIdentifier();
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
index bb5dde540e..0ddac8d205 100644
--- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
+++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.netcore.vcxproj
@@ -154,7 +154,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -174,7 +175,8 @@
       <PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -194,7 +196,8 @@
       <PreprocessorDefinitions>_DEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -214,7 +217,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -232,7 +236,8 @@
       <PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -250,7 +255,8 @@
       <PreprocessorDefinitions>NDEBUG;EXPORT;NETCOREAPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
index 2514acccc6..08b144e25c 100644
--- a/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
+++ b/CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj
@@ -111,7 +111,8 @@
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -129,7 +130,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -146,7 +148,8 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -161,7 +164,8 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/CefSharp.BrowserSubprocess.Core/Stdafx.h b/CefSharp.BrowserSubprocess.Core/Stdafx.h
index f080d8421a..263c6361ea 100644
--- a/CefSharp.BrowserSubprocess.Core/Stdafx.h
+++ b/CefSharp.BrowserSubprocess.Core/Stdafx.h
@@ -10,6 +10,8 @@
 #define DECL __declspec(dllimport)
 #endif
 
+#define NOMINMAX
+
 #include <vector>
 
 #include <include/cef_base.h>
diff --git a/CefSharp.BrowserSubprocess.Core/Wrapper/Browser.h b/CefSharp.BrowserSubprocess.Core/Wrapper/Browser.h
index a81f3d1359..c105d8b37e 100644
--- a/CefSharp.BrowserSubprocess.Core/Wrapper/Browser.h
+++ b/CefSharp.BrowserSubprocess.Core/Wrapper/Browser.h
@@ -19,7 +19,7 @@ namespace CefSharp
             bool _disposed;
 
         internal:
-            Browser(CefRefPtr<CefBrowser> &browser)
+            Browser(const CefRefPtr<CefBrowser> &browser)
                 : _browser(browser)
             {
             }
diff --git a/CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h b/CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h
index b38b767615..941d04fb4b 100644
--- a/CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h
+++ b/CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h
@@ -31,7 +31,7 @@ namespace CefSharp
             bool _disposed;
 
         internal:
-            Frame(CefRefPtr<CefFrame> &frame)
+            Frame(const CefRefPtr<CefFrame> &frame)
                 : _frame(frame), _parentFrame(nullptr),
                 _owningBrowser(nullptr), _syncRoot(gcnew Object())
             {
diff --git a/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs b/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs
index f9fffdfabe..f6d2e2552d 100644
--- a/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs
+++ b/CefSharp.Core.Runtime.RefAssembly/CefSharp.Core.Runtime.netcore.cs
@@ -16,6 +16,8 @@ public BrowserSettings() { }
         public BrowserSettings(bool autoDispose) { }
         public virtual bool AutoDispose { get { throw null; } }
         public virtual uint BackgroundColor { get { throw null; } set { } }
+        public virtual CefSharp.CefState ChromeStatusBubble { get { throw null; } set { } }
+        public virtual CefSharp.CefState ChromeZoomBubble { get { throw null; } set { } }
         public virtual string CursiveFontFamily { get { throw null; } set { } }
         public virtual CefSharp.CefState Databases { get { throw null; } set { } }
         public virtual string DefaultEncoding { get { throw null; } set { } }
@@ -40,8 +42,6 @@ public BrowserSettings(bool autoDispose) { }
         public virtual CefSharp.CefState TabToLinks { get { throw null; } set { } }
         public virtual CefSharp.CefState TextAreaResize { get { throw null; } set { } }
         public virtual CefSharp.CefState WebGl { get { throw null; } set { } }
-        public virtual CefSharp.CefState ChromeStatusBubble { get { throw null; } set { } }
-        public virtual CefSharp.CefState ChromeZoomBubble { get { throw null; } set { } }
         public virtual int WindowlessFrameRate { get { throw null; } set { } }
         public void Dispose() { }
         protected virtual void Dispose(bool A_0) { }
diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj
index 53bc6e63cf..043313049c 100644
--- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj
+++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.netcore.vcxproj
@@ -178,7 +178,8 @@
       <PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -212,7 +213,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -243,7 +245,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -273,7 +276,8 @@
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -297,7 +301,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -319,7 +324,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
index c036f4140e..62e03d7eef 100644
--- a/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
+++ b/CefSharp.Core.Runtime/CefSharp.Core.Runtime.vcxproj
@@ -130,7 +130,8 @@
       <PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -161,7 +162,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <PrecompiledHeaderFile>Stdafx.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <ProjectReference>
       <LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -188,7 +190,8 @@
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -209,7 +212,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
     <Link>
       <AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/CefSharp.Core.Runtime/DragData.h b/CefSharp.Core.Runtime/DragData.h
index 48aa18fe28..b31f0af62f 100644
--- a/CefSharp.Core.Runtime/DragData.h
+++ b/CefSharp.Core.Runtime/DragData.h
@@ -26,7 +26,7 @@ namespace CefSharp
             MCefRefPtr<CefDragData> _wrappedDragData;
 
         internal:
-            DragData(CefRefPtr<CefDragData> &dragData) :
+            DragData(const CefRefPtr<CefDragData> &dragData) :
                 _wrappedDragData(dragData)
             {
                 IsReadOnly = dragData->IsReadOnly();
diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
index ca6bb5f5ca..4db8861ca7 100644
--- a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
@@ -26,7 +26,7 @@ namespace CefSharp
             double GetZoomLevelOnUI();
 
         internal:
-            CefBrowserHostWrapper(CefRefPtr<CefBrowserHost> &browserHost) : _browserHost(browserHost)
+            CefBrowserHostWrapper(const CefRefPtr<CefBrowserHost> &browserHost) : _browserHost(browserHost)
             {
             }
 
diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserWrapper.h b/CefSharp.Core.Runtime/Internals/CefBrowserWrapper.h
index e7a1f5c4a4..13ed5dcdb1 100644
--- a/CefSharp.Core.Runtime/Internals/CefBrowserWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefBrowserWrapper.h
@@ -20,7 +20,7 @@ namespace CefSharp
             IBrowserHost^ _browserHost;
 
         internal:
-            CefBrowserWrapper::CefBrowserWrapper(CefRefPtr<CefBrowser> &browser)
+            CefBrowserWrapper(const CefRefPtr<CefBrowser> &browser)
                 : _browser(browser), _browserHost(nullptr)
             {
             }
diff --git a/CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.cpp
index 7259b17804..fa98e45067 100644
--- a/CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.cpp
+++ b/CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.cpp
@@ -111,7 +111,7 @@ namespace CefSharp
         {
             ThrowIfDisposed();
 
-            std::vector<CefString>& dictionarySuggestions = std::vector<CefString>();
+            std::vector<CefString> dictionarySuggestions;
             bool result = _wrappedInfo->GetDictionarySuggestions(dictionarySuggestions);
 
             return StringUtils::ToClr(dictionarySuggestions);
diff --git a/CefSharp.Core.Runtime/Internals/CefFrameWrapper.h b/CefSharp.Core.Runtime/Internals/CefFrameWrapper.h
index 7927e1e0ef..3493e3bdd2 100644
--- a/CefSharp.Core.Runtime/Internals/CefFrameWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefFrameWrapper.h
@@ -32,7 +32,7 @@ namespace CefSharp
             Object^ _syncRoot;
 
         internal:
-            CefFrameWrapper::CefFrameWrapper(CefRefPtr<CefFrame> &frame)
+            CefFrameWrapper(const CefRefPtr<CefFrame> &frame)
                 : _frame(frame), _parentFrame(nullptr),
                 _owningBrowser(nullptr), _syncRoot(gcnew Object())
             {
diff --git a/CefSharp.Core.Runtime/Internals/CefImageWrapper.h b/CefSharp.Core.Runtime/Internals/CefImageWrapper.h
index 6e69cc2a3f..4358d841c4 100644
--- a/CefSharp.Core.Runtime/Internals/CefImageWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefImageWrapper.h
@@ -21,7 +21,7 @@ namespace CefSharp
         internal:
             MCefRefPtr<CefImage> _image;
 
-            CefImageWrapper::CefImageWrapper(CefRefPtr<CefImage> &image)
+            CefImageWrapper(const CefRefPtr<CefImage> &image)
                 : _image(image)
             {
             }
diff --git a/CefSharp.Core.Runtime/Internals/CefResponseWrapper.h b/CefSharp.Core.Runtime/Internals/CefResponseWrapper.h
index d0bcdd752b..a344dc18a1 100644
--- a/CefSharp.Core.Runtime/Internals/CefResponseWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefResponseWrapper.h
@@ -19,7 +19,7 @@ namespace CefSharp
         {
             MCefRefPtr<CefResponse> _response;
         internal:
-            CefResponseWrapper(CefRefPtr<CefResponse> &response) :
+            CefResponseWrapper(const CefRefPtr<CefResponse> &response) :
                 _response(response)
             {
 
diff --git a/CefSharp.Core.Runtime/Internals/CefValueWrapper.h b/CefSharp.Core.Runtime/Internals/CefValueWrapper.h
index aa0b667ea7..ea14a59f9e 100644
--- a/CefSharp.Core.Runtime/Internals/CefValueWrapper.h
+++ b/CefSharp.Core.Runtime/Internals/CefValueWrapper.h
@@ -53,7 +53,7 @@ namespace CefSharp
             }
 
         internal:
-            CefValueWrapper(CefRefPtr<CefValue> &cefValue) : _cefValue(cefValue)
+            CefValueWrapper(const CefRefPtr<CefValue> &cefValue) : _cefValue(cefValue)
             {
             }
 
diff --git a/CefSharp.Core.Runtime/Internals/StringUtils.h b/CefSharp.Core.Runtime/Internals/StringUtils.h
index 3b819c0f80..2ba1467ad7 100644
--- a/CefSharp.Core.Runtime/Internals/StringUtils.h
+++ b/CefSharp.Core.Runtime/Internals/StringUtils.h
@@ -26,7 +26,7 @@ namespace CefSharp
             /// <param name="cefStr">The string that should be converted.</param>
             /// <returns>A .NET string.</returns>
             [DebuggerStepThrough]
-            static String^ StringUtils::ToClr(const cef_string_t& cefStr)
+            static String^ ToClr(const cef_string_t& cefStr)
             {
                 auto str = reinterpret_cast<wchar_t*>(cefStr.str);
 
@@ -39,7 +39,7 @@ namespace CefSharp
             /// <param name="cefStr">The string that should be converted.</param>
             /// <returns>A .NET string.</returns>
             [DebuggerStepThrough]
-            static String^ StringUtils::ToClr(const CefString& cefStr)
+            static String^ ToClr(const CefString& cefStr)
             {
                 auto str = reinterpret_cast<const wchar_t*>(cefStr.c_str());
 
@@ -112,7 +112,7 @@ namespace CefSharp
             /// <param name="cefStr">The cef_string_t that should be updated.</param>
             /// <param name="str">The .NET string whose value should be used to update cefStr.</param>
             [DebuggerStepThrough]
-            static void StringUtils::AssignNativeFromClr(cef_string_t& cefStr, String^ str)
+            static void AssignNativeFromClr(cef_string_t& cefStr, String^ str)
             {
                 cef_string_clear(&cefStr);
 
diff --git a/CefSharp.Core.Runtime/RequestContext.h b/CefSharp.Core.Runtime/RequestContext.h
index 13e4ddbd83..a46ca63a4a 100644
--- a/CefSharp.Core.Runtime/RequestContext.h
+++ b/CefSharp.Core.Runtime/RequestContext.h
@@ -42,7 +42,7 @@ namespace CefSharp
             RequestContextSettings^ _settings;
 
         internal:
-            RequestContext(CefRefPtr<CefRequestContext>& context)
+            RequestContext(const CefRefPtr<CefRequestContext>& context)
             {
                 _requestContext = context.get();
                 _settings = nullptr;
diff --git a/CefSharp.Core.Runtime/Stdafx.h b/CefSharp.Core.Runtime/Stdafx.h
index 7214f76f35..c234e6e0ef 100644
--- a/CefSharp.Core.Runtime/Stdafx.h
+++ b/CefSharp.Core.Runtime/Stdafx.h
@@ -10,6 +10,8 @@
 #define DECL __declspec(dllimport)
 #endif
 
+#define NOMINMAX
+
 #include <vector>
 #include <list>