diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index d98533e4bc..d70b0bbe84 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -112,7 +112,7 @@ dependencies {
     def moshi_version = '1.8.0'
     def lifecycle_version = '2.2.0'
     def arch_version = '2.1.0'
-    def coroutines_version = "1.3.2"
+    def coroutines_version = "1.3.8"
     def markwon_version = '3.1.0'
     def daggerVersion = '2.25.4'
     def work_version = '2.3.3'
@@ -122,8 +122,8 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.core:core-ktx:1.3.0"
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.core:core-ktx:1.3.1"
 
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
diff --git a/vector/build.gradle b/vector/build.gradle
index 57fd0cc51a..5738e25b65 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -264,7 +264,7 @@ dependencies {
     def epoxy_version = '3.11.0'
     def fragment_version = '1.2.5'
     def arrow_version = "0.8.2"
-    def coroutines_version = "1.3.2"
+    def coroutines_version = "1.3.8"
     def markwon_version = '4.1.2'
     def big_image_viewer_version = '1.6.2'
     def glide_version = '4.11.0'
@@ -286,13 +286,13 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
 
-    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha04"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.recyclerview:recyclerview:1.2.0-alpha05"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "androidx.fragment:fragment:$fragment_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
     // Keep at 2.0.0-beta4 at the moment, as updating is breaking some UI
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
-    implementation 'androidx.core:core-ktx:1.3.0'
+    implementation 'androidx.core:core-ktx:1.3.1'
 
     implementation "org.threeten:threetenbp:1.4.0:no-tzdb"
     implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.7.0"
@@ -390,9 +390,7 @@ dependencies {
     kapt 'com.squareup.inject:assisted-inject-processor-dagger2:0.5.0'
 
     // gplay flavor only
-    // Warning: due to the exclude, Android Studio does not propose to upgrade. Uncomment next line to be proposed to upgrade
-    // implementation 'com.google.firebase:firebase-messaging:20.0.0'
-    gplayImplementation('com.google.firebase:firebase-messaging:20.2.1') {
+    gplayImplementation('com.google.firebase:firebase-messaging:20.2.4') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
index fbeb5b954d..6c406aa682 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt
@@ -268,7 +268,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
                     Glide.get(requireContext()).clearMemory()
                     session.fileService().clearCache()
 
-                    var newSize = 0
+                    var newSize: Int
 
                     withContext(Dispatchers.IO) {
                         // On BG thread