diff --git a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
index c9af9fa9e0..4a9b9cb649 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
@@ -970,6 +970,13 @@ Device::populateOCLDeviceConstants()
         }
     }
 
+    if (HSA_STATUS_SUCCESS !=
+        hsa_agent_get_info(_bkendDevice,
+                           HSA_AGENT_INFO_WAVEFRONT_SIZE,
+                           &info_.wavefrontWidth_)) {
+        return false;
+    }
+
     return true;
 }
 
diff --git a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
index c9a1bbc819..9ab97d0603 100644
--- a/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
+++ b/projects/clr/rocclr/runtime/device/rocm/rocsettings.cpp
@@ -80,6 +80,8 @@ Settings::create(bool doublePrecision)
         // Also enable AMD double precision extension?
         enableExtension(ClAmdFp64);
     }
+    
+    enableExtension(ClKhrSubGroups);
 
     enableExtension(ClKhrDepthImages);
     supportDepthsRGB_ = true;