diff --git a/ReactCommon/yoga/yoga/YGMacros.h b/ReactCommon/yoga/yoga/YGMacros.h
index d56f3aeb7377f0..36a5405d740464 100644
--- a/ReactCommon/yoga/yoga/YGMacros.h
+++ b/ReactCommon/yoga/yoga/YGMacros.h
@@ -24,10 +24,11 @@
 // Cannot use NSInteger as NSInteger has a different size than int (which is the
 // default type of a enum). Therefor when linking the Yoga C library into obj-c
 // the header is a missmatch for the Yoga ABI.
-#define YG_ENUM_BEGIN(name) NS_ENUM(int, name)
+// We're using unsigned int explicitly because sign of enums and bitfields is implementation specific.
+#define YG_ENUM_BEGIN(name) NS_ENUM(unsigned int, name)
 #define YG_ENUM_END(name)
 #else
-#define YG_ENUM_BEGIN(name) enum name
+#define YG_ENUM_BEGIN(name) enum name: unsigned int
 #define YG_ENUM_END(name) name
 #endif
 
diff --git a/scripts/generate-rncore.sh b/scripts/generate-rncore.sh
index 00d56ae97fe6fa..275696b0ec55db 100644
--- a/scripts/generate-rncore.sh
+++ b/scripts/generate-rncore.sh
@@ -9,5 +9,6 @@
 # to a location that the podspecs expect.
 
 # shellcheck disable=SC2038
-find "$PWD/../Libraries" -name "*Schema.js" -print | xargs yarn flow-node packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js schema-rncore.json
+
+find "$PWD/../Libraries" -name "*NativeComponent.js" -print | xargs yarn flow-node packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js schema-rncore.json
 yarn flow-node packages/react-native-codegen/buck_tests/generate-tests.js schema-rncore.json rncore ReactCommon/fabric/components/rncore