diff --git a/AppleModels/DataBase/MacBookPro/MBP92.yaml b/AppleModels/DataBase/MacBookPro/MBP92.yaml
index 702ca76d4662d6ec3645c74b320df5c3cf44bb36..d41e2f7fcb82c246540abaa979b38d522af8a63c 100644
--- a/AppleModels/DataBase/MacBookPro/MBP92.yaml
+++ b/AppleModels/DataBase/MacBookPro/MBP92.yaml
@@ -18,22 +18,16 @@ BoardProduct: "Mac-6F01561E16C75D06"
 BoardVersion: "MacBookPro9,2"
 BoardAssetTag: "Base Board Asset Tag#"
 BoardType: 0xA
-# FIXME: check
 BoardLocationInChassis: "Part Component"
 ChassisManufacturer: "Apple Inc."
 ChassisType: 0xA
 ChassisVersion: "Mac-6F01561E16C75D06"
 ChassisAssetTag: ""
-# FIXME: check
-FirmwareFeatures: 0xC00DE137
-# FIXME: check
-FirmwareFeaturesMask: 0xFF1FFF3F
-# FIXME: check
-ExtendedFirmwareFeatures: 0x00000000C00DE137
-# FIXME: check
-ExtendedFirmwareFeaturesMask: 0x00000000FF1FFF3F
+FirmwareFeatures: 0xC10DF577
+FirmwareFeaturesMask: 0xFF1FFF7F
+ExtendedFirmwareFeatures: 0x00000000C10DF577
+ExtendedFirmwareFeaturesMask: 0x00000000FF1FFF7F
 MemoryFormFactor: 0xD
-# FIXME: check values (most should be correct?) and add missing, if any
 ProcessorType:
   - 0x0604
   - 0x0704
diff --git a/AppleModels/DataBase/iMac/IM141.yaml b/AppleModels/DataBase/iMac/IM141.yaml
index 64481923b452cb6b9c467f1a196afe58d9ddb393..43ab135078fc9866107e9e7b8cb3ae4145ed0998 100644
--- a/AppleModels/DataBase/iMac/IM141.yaml
+++ b/AppleModels/DataBase/iMac/IM141.yaml
@@ -24,16 +24,11 @@ ChassisType: 0xD
 ChassisVersion: "Mac-031B6874CF7F642A"
 ChassisAssetTag: ""
 PlatformFeature: 0x1
-# FIXME: check
-FirmwareFeatures: 0xE00FE137
-# FIXME: check
-FirmwareFeaturesMask: 0xFF1FFF3F
-# FIXME: check
-ExtendedFirmwareFeatures: 0x00000000E00FE137
-# FIXME: check
-ExtendedFirmwareFeaturesMask: 0x00000000FF1FFF3F
+FirmwareFeatures: 0xFB0FF577
+FirmwareFeaturesMask: 0xFF1FFF7F
+ExtendedFirmwareFeatures: 0x00000000FB0FF577
+ExtendedFirmwareFeaturesMask: 0x00000000FF1FFF7F
 MemoryFormFactor: 0x9
-# FIXME: check values (most should be correct?) and add missing, if any
 ProcessorType:
   - 0x0605
 # FIXME: Correct this one
diff --git a/Library/OcMacInfoLib/AutoGenerated.c b/Library/OcMacInfoLib/AutoGenerated.c
index 0674d78f1035151d988982b6ed3b8221ef7a8482..0d7f90dc927c0653b2f297bf38544b988d51e2af 100755
--- a/Library/OcMacInfoLib/AutoGenerated.c
+++ b/Library/OcMacInfoLib/AutoGenerated.c
@@ -1606,8 +1606,8 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .MemoryFormFactor = 0xD,
   .PlatformFeature = MAC_INFO_PLATFORM_FEATURE_MISSING,
   .ChassisAssetTag = "",
-  .FirmwareFeatures = 0xC00DE137ULL,
-  .FirmwareFeaturesMask = 0xFF1FFF3FULL,
+  .FirmwareFeatures = 0xC10DF577ULL,
+  .FirmwareFeaturesMask = 0xFF1FFF7FULL,
  },
  {
   .SystemProductName = "MacPro1,1",
@@ -2350,8 +2350,8 @@ CONST MAC_INFO_INTERNAL_ENTRY gMacInfoModels[] = {
   .MemoryFormFactor = 0x9,
   .PlatformFeature = 0x1,
   .ChassisAssetTag = "",
-  .FirmwareFeatures = 0xE00FE137ULL,
-  .FirmwareFeaturesMask = 0xFF1FFF3FULL,
+  .FirmwareFeatures = 0xFB0FF577ULL,
+  .FirmwareFeaturesMask = 0xFF1FFF7FULL,
  },
  {
   .SystemProductName = "iMac14,2",