diff --git a/examples/run-android.sh b/examples/run-android.sh
index e751c210..df6736f1 100755
--- a/examples/run-android.sh
+++ b/examples/run-android.sh
@@ -37,5 +37,4 @@ else
   selected="${devices[$idx]}"
 fi
 
-cd "$(dirname "$0")/demo"
 ANDROID_SERIAL="$selected" bunx react-native run-android --deviceId "$selected"
diff --git a/examples/run-ios.sh b/examples/run-ios.sh
index 24ab04e8..a46af8f4 100755
--- a/examples/run-ios.sh
+++ b/examples/run-ios.sh
@@ -70,5 +70,4 @@ name="${selected%%|*}"
 udid="${selected##*|}"
 echo "Using simulator: $name ($udid)"
 
-cd "$(dirname "$0")/demo"
 bunx react-native run-ios --udid "$udid"
diff --git a/src/NativeOneSignal.ts b/src/NativeOneSignal.ts
index ba2fd5eb..1c17ebb8 100644
--- a/src/NativeOneSignal.ts
+++ b/src/NativeOneSignal.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-wrapper-object-types */
-import type { CodegenTypes, TurboModule } from 'react-native';
+import type { TurboModule } from 'react-native';
 import { TurboModuleRegistry } from 'react-native';
+import type { EventEmitter } from 'react-native/Libraries/Types/CodegenTypes';
 
 export interface Spec extends TurboModule {
   // OneSignal root
@@ -90,16 +91,16 @@ export interface Spec extends TurboModule {
   addOutcomeWithValue(name: string, value: number): void;
 
   // Events
-  readonly onPermissionChanged: CodegenTypes.EventEmitter<Object>;
-  readonly onSubscriptionChanged: CodegenTypes.EventEmitter<Object>;
-  readonly onUserStateChanged: CodegenTypes.EventEmitter<Object>;
-  readonly onNotificationWillDisplay: CodegenTypes.EventEmitter<Object>;
-  readonly onNotificationClicked: CodegenTypes.EventEmitter<Object>;
-  readonly onInAppMessageClicked: CodegenTypes.EventEmitter<Object>;
-  readonly onInAppMessageWillDisplay: CodegenTypes.EventEmitter<Object>;
-  readonly onInAppMessageDidDisplay: CodegenTypes.EventEmitter<Object>;
-  readonly onInAppMessageWillDismiss: CodegenTypes.EventEmitter<Object>;
-  readonly onInAppMessageDidDismiss: CodegenTypes.EventEmitter<Object>;
+  readonly onPermissionChanged: EventEmitter<Object>;
+  readonly onSubscriptionChanged: EventEmitter<Object>;
+  readonly onUserStateChanged: EventEmitter<Object>;
+  readonly onNotificationWillDisplay: EventEmitter<Object>;
+  readonly onNotificationClicked: EventEmitter<Object>;
+  readonly onInAppMessageClicked: EventEmitter<Object>;
+  readonly onInAppMessageWillDisplay: EventEmitter<Object>;
+  readonly onInAppMessageDidDisplay: EventEmitter<Object>;
+  readonly onInAppMessageWillDismiss: EventEmitter<Object>;
+  readonly onInAppMessageDidDismiss: EventEmitter<Object>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('OneSignal');