diff --git a/public/schemasystem/schematypes.h b/public/schemasystem/schematypes.h
index d0c1ee7e..2f58e30b 100644
--- a/public/schemasystem/schematypes.h
+++ b/public/schemasystem/schematypes.h
@@ -29,7 +29,7 @@ struct SchemaTypeMap {};
 	static inline bool Match( CSchemaType *ptr ) { return ptr->m_eTypeCategory == type_category && ptr->m_eAtomicCategory == atomic_category; } \
 };
 
-enum SchemaClassFlags1_t
+enum SchemaClassFlags1_t : uint32
 {
 	SCHEMA_CF1_HAS_VIRTUAL_MEMBERS = (1 << 0),
 	SCHEMA_CF1_IS_ABSTRACT = (1 << 1),
@@ -52,9 +52,9 @@ enum SchemaClassFlags1_t
 	SCHEMA_CF1_INFO_TAG_MHasKV3TransferPolymorphicClassname = (1 << 18),
 };
 
-enum SchemaClassFlags2_t {};
+enum SchemaClassFlags2_t : uint32 {};
 
-enum SchemaEnumFlags_t
+enum SchemaEnumFlags_t : uint8
 {
 	SCHEMA_EF_IS_REGISTERED = (1 << 0),
 	SCHEMA_EF_MODULE_LOCAL_TYPE_SCOPE = (1 << 1),
@@ -370,8 +370,8 @@ struct SchemaClassInfoData_t
 	CSchemaSystemTypeScope* m_pTypeScope;
 	CSchemaType_DeclaredClass* m_pDeclaredClass;
 	
-	uint m_nFlags1;
-	uint m_nFlags2;
+	uint32 m_nFlags1;
+	uint32 m_nFlags2;
 	
 	SchemaClassManipulatorFn_t m_pfnManipulator;
 };
@@ -400,7 +400,8 @@ struct SchemaEnumInfoData_t
 	uint8 m_nSize;
 	uint8 m_nAlignment;
 	
-	uint16 m_nFlags;
+	uint8 m_nFlags;
+
 	uint16 m_nEnumeratorCount;
 	uint16 m_nStaticMetadataCount;