diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9e86530..2634534 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -45,6 +45,9 @@ android {
 
     lintOptions {
         disable 'InvalidPackage'
+
+        // TODO remove this fix to use Gradle plugin 4 ASAP
+        checkReleaseBuilds false
     }
 
     defaultConfig {
@@ -110,9 +113,9 @@ flutter {
 
 dependencies {
     implementation 'com.neovisionaries:nv-websocket-client:2.14'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/build_all_comunic_releases.sh b/build_all_comunic_releases.sh
index 5483b69..4270145 100755
--- a/build_all_comunic_releases.sh
+++ b/build_all_comunic_releases.sh
@@ -5,7 +5,7 @@ make stable_release_split_per_abi && \
 	mv build/app/outputs/flutter-apk/app-armeabi-v7a-stable-release.apk "$DEST" && \
 	mv build/app/outputs/flutter-apk/app-arm64-v8a-stable-release.apk "$DEST" && \
 	mv build/app/outputs/flutter-apk/app-x86_64-stable-release.apk "$DEST" && \
-	mv build/app/outputs/mapping/stable/release/mapping.txt "$DEST" && \
+	mv build/app/outputs/mapping/stableRelease/mapping.txt "$DEST" && \
 	make stable_release && \
 	mv build/app/outputs/flutter-apk/app-stable-release.apk "$DEST"
 
diff --git a/build_all_forez.sh b/build_all_forez.sh
index bd77677..1988784 100755
--- a/build_all_forez.sh
+++ b/build_all_forez.sh
@@ -5,4 +5,4 @@ make forez_release_split_per_abi && \
 	mv build/app/outputs/flutter-apk/app-armeabi-v7a-forez-release.apk "$DEST" && \
 	mv build/app/outputs/flutter-apk/app-arm64-v8a-forez-release.apk "$DEST" && \
 	mv build/app/outputs/flutter-apk/app-x86_64-forez-release.apk "$DEST" && \
-	mv build/app/outputs/mapping/forez/release/mapping.txt "$DEST"
\ No newline at end of file
+	mv build/app/outputs/mapping/forezRelease/mapping.txt "$DEST"
\ No newline at end of file
diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart
index 8ab4411..3db6415 100644
--- a/lib/generated_plugin_registrant.dart
+++ b/lib/generated_plugin_registrant.dart
@@ -9,13 +9,14 @@ import 'package:connectivity_for_web/connectivity_for_web.dart';
 import 'package:file_picker/_internal/file_picker_web.dart';
 import 'package:firebase_core_web/firebase_core_web.dart';
 import 'package:firebase_messaging_web/firebase_messaging_web.dart';
-import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:shared_preferences_web/shared_preferences_web.dart';
 import 'package:url_launcher_web/url_launcher_web.dart';
 import 'package:video_player_web/video_player_web.dart';
 import 'package:wakelock_web/wakelock_web.dart';
 
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
 // ignore: public_member_api_docs
 void registerPlugins(Registrar registrar) {
   ConnectivityPlugin.registerWith(registrar);