diff --git a/README.md b/README.md
index 7e89d961..ba6f6580 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ All in all, RNFirebase provides much faster performance (~2x) over the web SDK a
 | **Crashlytics**            |   ❌   |   ✅   |   ✅   |   ❌   |
 | **Crash Reporting**        |   ✅   |   ✅   |   ✅   |   ❌   |
 | **Dynamic Links**          |   ❌   |   ✅   |   ✅   |   ❌   |
+| **[Functions Callable](https://firebase.googleblog.com/2018/04/launching-cloud-functions-for-firebase-1-0.html?m=1)**              |   ❌   |   ❌   |  [v4.1+](https://github.com/invertase/react-native-firebase/milestone/6)   |   ✅   |
 | **Invites**                |   ❌   |   ❌   |   ✅   |   ❌   |
 | **Instance ID**            |   ❌   |   ❌   | **?**  |   ❌   |
 | **Performance Monitoring** |   ✅   |   ✅   |   ✅   |   ❌   |
diff --git a/ios/RNFirebase/analytics/RNFirebaseAnalytics.m b/ios/RNFirebase/analytics/RNFirebaseAnalytics.m
index 4c412924..2347bc16 100644
--- a/ios/RNFirebase/analytics/RNFirebaseAnalytics.m
+++ b/ios/RNFirebase/analytics/RNFirebaseAnalytics.m
@@ -16,7 +16,7 @@ RCT_EXPORT_METHOD(setAnalyticsCollectionEnabled:(BOOL) enabled) {
 }
 
 RCT_EXPORT_METHOD(setCurrentScreen:(NSString *) screenName screenClass:(NSString *) screenClassOverriew) {
-  dispatch_async(dispatch_get_main_queue(), ^{
+  dispatch_sync(dispatch_get_main_queue(), ^{
     [FIRAnalytics setScreenName:screenName screenClass:screenClassOverriew];
   });
 }
diff --git a/package-lock.json b/package-lock.json
index f0e2b7de..06fa8243 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-firebase",
-  "version": "4.0.0-rc.3",
+  "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 87187ad3..e6cd06f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-firebase",
-  "version": "4.0.0-rc.3",
+  "version": "4.0.0",
   "author": "Invertase <contact@invertase.io> (http://invertase.io)",
   "description": "A well tested, feature rich Firebase implementation for React Native, supporting iOS & Android. Individual module support for Admob, Analytics, Auth, Crash Reporting, Cloud Firestore, Database, Dynamic Links, Messaging (FCM), Remote Config, Storage and Performance.",
   "main": "dist/index.js",