diff --git a/GenericApp/app/google-services.json b/GenericApp/app/google-services.json
index 8880fd5..75b2bc9 100644
--- a/GenericApp/app/google-services.json
+++ b/GenericApp/app/google-services.json
@@ -3,7 +3,7 @@
     "project_number": "667022545910",
     "firebase_url": "https://openremoteapp-a6a60.firebaseio.com",
     "project_id": "openremoteapp-a6a60",
-    "storage_bucket": "openremoteapp-a6a60.appspot.com"
+    "storage_bucket": "openremoteapp-a6a60.firebasestorage.app"
   },
   "client": [
     {
@@ -13,12 +13,7 @@
           "package_name": "io.openremote.app"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "667022545910-g53k1fiocps3sso32hqvotr34fe2libr.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
           "current_key": "AIzaSyCXUqMM_P0Vo_pGmebCLgyD8RWeSN71TxU"
@@ -26,19 +21,7 @@
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "667022545910-g53k1fiocps3sso32hqvotr34fe2libr.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "667022545910-9fee9uvb8iguprjtimmq8uea6cqt2p5i.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "io.openremote.app"
-              }
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }
diff --git a/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt b/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
index d7251b5..242badb 100644
--- a/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
+++ b/ORLib/src/main/java/io/openremote/orlib/service/ORFirebaseMessagingService.kt
@@ -73,7 +73,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
             // Mark as delivered on the server
             val notificationIdStr = messageData["notification-id"]
             var notificationId: Long? = null
-            if (notificationIdStr != null && notificationIdStr.isNotEmpty()) {
+            if (!notificationIdStr.isNullOrEmpty()) {
                 notificationId = notificationIdStr.toLong()
                 val consoleId: String? = getSharedPreferences(
                     applicationContext.getString(R.string.app_name),
@@ -105,7 +105,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
                 // Check for action (to be executed when notification is clicked)
                 if (messageData.containsKey("action")) {
                     val actionJson = messageData["action"]
-                    if (actionJson != null && actionJson.isNotEmpty()) {
+                    if (!actionJson.isNullOrEmpty()) {
                         try {
                             actionOR = jacksonObjectMapper().readValue(
                                 actionJson,
@@ -120,7 +120,7 @@ class ORFirebaseMessagingService : com.google.firebase.messaging.FirebaseMessagi
                 // Check for buttons
                 if (messageData.containsKey("buttons")) {
                     val buttonsJson = messageData["buttons"]
-                    if (buttonsJson != null && buttonsJson.isNotEmpty()) {
+                    if (!buttonsJson.isNullOrEmpty()) {
                         try {
                             buttonORS = jacksonObjectMapper().readValue(
                                 buttonsJson,