diff --git a/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp b/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp
index 78fc0e3f0..667713957 100644
--- a/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp
+++ b/libraries/libstratosphere/include/stratosphere/erpt/erpt_ids.autogen.hpp
@@ -99,6 +99,7 @@
     HANDLER(RadioStrengthInfo,                   58 ) \
     HANDLER(ErrorInfoAuto,                       59 ) \
     HANDLER(AccessPointInfo,                     60 ) \
+    HANDLER(ErrorInfoDefaults,                   61 ) \
     HANDLER(SystemPowerStateInfo,                62 ) \
     HANDLER(PerformanceInfo,                     63 ) \
     HANDLER(ThrottlingInfo,                      64 ) \
@@ -109,6 +110,7 @@
     HANDLER(RunningApplicationInfo,              69 ) \
     HANDLER(RunningAppletInfo,                   70 ) \
     HANDLER(FocusedAppletHistoryInfo,            71 ) \
+    HANDLER(CompositorInfo,                      72 ) \
     HANDLER(BatteryChargeInfo,                   73 ) \
     HANDLER(NANDExtendedCsd,                     74 ) \
     HANDLER(NANDPatrolInfo,                      75 ) \
diff --git a/utilities/erpt.py b/utilities/erpt.py
index 23f01e1ab..0c139d49e 100644
--- a/utilities/erpt.py
+++ b/utilities/erpt.py
@@ -396,11 +396,11 @@ def main(argc, argv):
     with open(argv[1]+'.hpp', 'w') as out:
         out.write(HEADER)
         out.write('#define AMS_ERPT_FOREACH_FIELD_TYPE(HANDLER) \\\n')
-        for tp in sorted(list(set(types))):
+        for tp in sorted(list(set(types + FIELD_TYPES.keys()))):
             out.write(('    HANDLER(%%-%ds %%-2d) \\\n' % (mt+1)) % (typ_to_string(tp)+',', tp))
         out.write('\n')
         out.write('#define AMS_ERPT_FOREACH_CATEGORY(HANDLER) \\\n')
-        for ct in sorted(list(set(cats))):
+        for ct in sorted(list(set(cats + CATEGORIES.keys()))):
             out.write(('    HANDLER(%%-%ds %%-3d) \\\n' % (mc+1)) % (cat_to_string(ct)+',', ct))
         out.write('\n')
         out.write('#define AMS_ERPT_FOREACH_FIELD(HANDLER) \\\n')