diff --git a/rocclr/runtime/device/pal/palcompiler.cpp b/rocclr/runtime/device/pal/palcompiler.cpp
index 51b8d8a500..460e7ee80e 100644
--- a/rocclr/runtime/device/pal/palcompiler.cpp
+++ b/rocclr/runtime/device/pal/palcompiler.cpp
@@ -211,7 +211,7 @@ LightningProgram::newCompilerInstance()
     pthread_once(&once, checkLLVM_BIN);
 #endif // defined(ATI_OS_LINUX)
 #if defined(DEBUG)
-    std::string clangExe(llvmBin_ + "/clang");
+    std::string clangExe(llvmBin_ + LINUX_SWITCH("/clang", "\\clang.exe"));
     struct stat buf;
     if (stat(clangExe.c_str(), &buf)) {
         std::string msg("Could not find the Clang binary in " + llvmBin_);
diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp
index c146c8e139..dccee6d56d 100644
--- a/rocclr/runtime/device/pal/palprogram.cpp
+++ b/rocclr/runtime/device/pal/palprogram.cpp
@@ -1338,7 +1338,8 @@ LightningProgram::setKernels(
         return false;
     }
 
-    setGlobalVariableTotalSize(progvarsTotalSize);
+    // note: The global variable size is updated in the context loader
+    //setGlobalVariableTotalSize(progvarsTotalSize);
 
     // Get the list of kernels
     std::vector<std::string> kernelNameList;