diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
index 547c044e..66658820 100644
--- a/Libs/DF/fw.lua
+++ b/Libs/DF/fw.lua
@@ -4254,7 +4254,7 @@ for _, class in ipairs(CLASS_SORT_ORDER) do
     for index, spec in ipairs(specs) do
         local ok, specInfo = pcall(C_ClassInfo.GetSpecInfo, class, spec)
         if ok and specInfo then
-		specs_per_class[index] = specInfo.ID
+		specs_per_class[class][index] = specInfo.ID
     end
         end
 end
diff --git a/Libs/DF/icongeneric.lua b/Libs/DF/icongeneric.lua
index e839b700..bf5160ad 100644
--- a/Libs/DF/icongeneric.lua
+++ b/Libs/DF/icongeneric.lua
@@ -208,7 +208,7 @@ detailsFramework.IconGenericMixin = {
             iconFrame.Border:ClearAllPoints()
             iconFrame.Border:SetPoint("topleft", iconFrame, "topleft", -1, 1)
             iconFrame.Border:SetPoint("bottomright", iconFrame, "bottomright", 1, -1)
-            iconFrame.Border:SetTexture(130759)
+            iconFrame.Border:SetTexture([[Interface\COMMON\WhiteIconFrame]])
             iconFrame.Border:SetTexCoord(0.296875, 0.5703125, 0, 0.515625)
             iconFrame.Border:SetDrawLayer("overlay", 7)
 
diff --git a/Libs/LibOpenRaid/LibOpenRaid.lua b/Libs/LibOpenRaid/LibOpenRaid.lua
index b99b4a9a..b35feb44 100644
--- a/Libs/LibOpenRaid/LibOpenRaid.lua
+++ b/Libs/LibOpenRaid/LibOpenRaid.lua
@@ -1295,8 +1295,8 @@ end
             end
             role = "DAMAGER"
         else
-            local specInfo = C_ClassInfo.GetSpecInfoByID(specId or 0)
-            if specInfo then
+            local ok, specInfo = pcall(C_ClassInfo.GetSpecInfoByID, specId or 0)
+            if ok and specInfo then
                 specName = specInfo.Name
                 specDescription = specInfo.Description
                 specIcon = "Interface\\Icons\\"..specInfo.SpecFilename