diff --git a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
index 5eb054878e..9835ecbef1 100644
--- a/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/pal/palsettings.cpp
@@ -260,7 +260,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp,
         supportDepthsRGB_ = true;
       }
       if (use64BitPtr_) {
-        if (GPU_ENABLE_LARGE_ALLOCATION && false /*wscaps.workStationBoard*/) {
+        if (GPU_ENABLE_LARGE_ALLOCATION && wscaps.workStationBoard) {
           maxAllocSize_ = 64ULL * Gi;
         } else {
           maxAllocSize_ = 4048 * Mi;
diff --git a/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp b/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp
index 0e03e323dd..fd5bf01c3f 100644
--- a/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp
+++ b/projects/clr/rocclr/runtime/device/pal/palvirtual.hpp
@@ -95,7 +95,7 @@ class VirtualGPU : public device::VirtualDevice {
     bool waifForFence(uint cbId, bool ibReuse = false) const {
       Pal::Result result = Pal::Result::Success;
       uint64_t start = amd::Os::timeNanos();
-      while (ibReuse || (Pal::Result::Success != (result = iCmdFences_[cbId]->GetStatus()))) {
+      while ((Pal::Result::Success != (result = iCmdFences_[cbId]->GetStatus())) || ibReuse) {
         if (result == Pal::Result::ErrorFenceNeverSubmitted) {
           result = Pal::Result::Success;
           break;