6 files changed, 9 insertions, 6 deletions
diff --git a/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp b/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp
index f937ce6edf..a2a01b14a7 100644
--- a/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp
+++ b/src/ToolBox/superpmi/superpmi-shim-collector/superpmi-shim-collector.cpp
@@ -82,10 +82,11 @@ void SetLogFilePath()
     }
 }
 
+extern "C"
 #ifdef FEATURE_PAL
 DLLEXPORT // For Win32 PAL LoadLibrary emulation
 #endif
-    extern "C" BOOL
+    BOOL
     DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     switch (ul_reason_for_call)
diff --git a/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp b/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp
index 57a4ad67ba..96996ee270 100644
--- a/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp
+++ b/src/ToolBox/superpmi/superpmi-shim-counter/superpmi-shim-counter.cpp
@@ -68,10 +68,11 @@ void SetLogFilePath()
     }
 }
 
+extern "C"
 #ifdef FEATURE_PAL
 DLLEXPORT // For Win32 PAL LoadLibrary emulation
 #endif
-    extern "C" BOOL
+    BOOL
     DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     switch (ul_reason_for_call)
diff --git a/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp b/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp
index 01341ccada..07663c8bce 100644
--- a/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp
+++ b/src/ToolBox/superpmi/superpmi-shim-simple/superpmi-shim-simple.cpp
@@ -58,10 +58,11 @@ void SetLogFilePath()
     }
 }
 
+extern "C"
 #ifdef FEATURE_PAL
 DLLEXPORT // For Win32 PAL LoadLibrary emulation
 #endif
-    extern "C" BOOL
+    BOOL
     DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
     switch (ul_reason_for_call)
diff --git a/src/vm/crossloaderallocatorhash.inl b/src/vm/crossloaderallocatorhash.inl
index f31d6583d2..e5c3266a4e 100644
--- a/src/vm/crossloaderallocatorhash.inl
+++ b/src/vm/crossloaderallocatorhash.inl
@@ -30,7 +30,7 @@ template <class TKey_, class TValue_>
     }
     else if ((entriesInArrayTotal >= 2) && (pStartOfValuesData[entriesInArrayTotal - 2] == (TValue)0))
     {
-        usedEntries = (DWORD)pStartOfValuesData[entriesInArrayTotal - 1];
+        usedEntries = (DWORD)(SIZE_T)pStartOfValuesData[entriesInArrayTotal - 1];
     }
     else if (pStartOfValuesData[entriesInArrayTotal - 1] == (TValue)0)
     {
diff --git a/src/vm/rejit.cpp b/src/vm/rejit.cpp
index 47bb7c410d..5492749020 100644
--- a/src/vm/rejit.cpp
+++ b/src/vm/rejit.cpp
@@ -509,7 +509,7 @@ BOOL NativeImageInliningIterator::Next()
 
 MethodDesc *NativeImageInliningIterator::GetMethodDesc()
 {
-    if (m_currentPos == -1 || m_currentPos >= m_dynamicBufferSize)
+    if (m_currentPos == (COUNT_T)-1 || m_currentPos >= m_dynamicBufferSize)
     {
         return NULL;
     }
diff --git a/src/vm/rejit.h b/src/vm/rejit.h
index a72630aeca..b417851d13 100644
--- a/src/vm/rejit.h
+++ b/src/vm/rejit.h
@@ -179,7 +179,7 @@ private:
         static bool IsNull(const element_t &e) { return (e == NULL); }
     };
 
-    static HRESULT ReJitManager::UpdateActiveILVersion(
+    static HRESULT UpdateActiveILVersion(
         SHash<CodeActivationBatchTraits> *pMgrToCodeActivationBatch,
         Module *            pModule,
         mdMethodDef         methodDef,