--- a/src/comgr-metadata.cpp
+++ b/src/comgr-metadata.cpp
@@ -473,13 +473,13 @@
     return false;
   }
 
-  unsigned ArchAttr = AMDGPU::getArchAttrAMDGCN(
+  const auto &Features = AMDGPU::getFeatureBitset(
       AMDGPU::parseArchAMDGCN(IsaInfos[IsaIndex].Processor));
 
   return (Feature.drop_back() == "xnack" &&
-          (ArchAttr & AMDGPU::FEATURE_XNACK_ON_OFF_MODES)) ||
+          Features.test(AMDGPU::FEAT_XNACK_ON_OFF_MODES)) ||
          (Feature.drop_back() == "sramecc" &&
-          (ArchAttr & AMDGPU::FEATURE_SRAMECC));
+          Features.test(AMDGPU::FEAT_SRAMECC_SUPPORT));
 }
 
 const char *getIsaName(size_t Index) { return IsaInfos[Index].IsaName; }
@@ -511,13 +511,13 @@
   Root["Version"] = Doc.getNode("1.0.0", /*Copy=*/true);
 
   AMDGPU::GPUKind Kind = AMDGPU::parseArchAMDGCN(IsaInfos[IsaIndex].Processor);
-  unsigned ArchAttr = AMDGPU::getArchAttrAMDGCN(Kind);
+  const auto &Features = AMDGPU::getFeatureBitset(Kind);
 
   auto FeaturesNode = Doc.getMapNode();
-  if (ArchAttr & AMDGPU::FEATURE_XNACK_ON_OFF_MODES) {
+  if (Features.test(AMDGPU::FEAT_XNACK_ON_OFF_MODES)) {
     FeaturesNode["xnack"] = Doc.getNode("any", /*Copy=*/true);
   }
-  if (ArchAttr & AMDGPU::FEATURE_SRAMECC) {
+  if (Features.test(AMDGPU::FEAT_SRAMECC_SUPPORT)) {
     FeaturesNode["sramecc"] = Doc.getNode("any", /*Copy=*/true);
   }
 
--- a/src/comgr-unbundle-command.cpp
+++ b/src/comgr-unbundle-command.cpp
@@ -121,7 +121,10 @@
 }
 
 CachedCommandAdaptor::ActionClass UnbundleCommand::getClass() const {
-  return clang::driver::Action::OffloadUnbundlingJobClass;
+  // OffloadUnbundlingJobClass is a ROCm llvm fork addition; use an
+  // unallocated class to distinguish it from any clang action, like
+  // SPIRVCommand does.
+  return clang::driver::Action::ActionClass::JobClassLast + 2;
 }
 
 void UnbundleCommand::addOptionsIdentifier(HashAlgorithm &H) const {
