diff --git a/android/build.gradle b/android/build.gradle
index 58a8c74b1..713d7f6e6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/lib/widgets/core/app_bar.dart b/lib/widgets/core/app_bar.dart
index 6e420c794..8f618cd33 100644
--- a/lib/widgets/core/app_bar.dart
+++ b/lib/widgets/core/app_bar.dart
@@ -29,7 +29,7 @@ import 'package:wger/screens/form_screen.dart';
 import 'package:wger/widgets/core/about.dart';
 import 'package:wger/widgets/user/forms.dart';
 
-class MainAppBar extends StatelessWidget with PreferredSizeWidget {
+class MainAppBar extends StatelessWidget implements PreferredSizeWidget {
   final String _title;
 
   MainAppBar(this._title);
@@ -113,7 +113,7 @@ class MainAppBar extends StatelessWidget with PreferredSizeWidget {
 }
 
 /// App bar that only displays a title
-class EmptyAppBar extends StatelessWidget with PreferredSizeWidget {
+class EmptyAppBar extends StatelessWidget implements PreferredSizeWidget {
   final String _title;
 
   EmptyAppBar(this._title);
diff --git a/lib/widgets/workouts/app_bar.dart b/lib/widgets/workouts/app_bar.dart
index ab8bd1480..73ce790d4 100644
--- a/lib/widgets/workouts/app_bar.dart
+++ b/lib/widgets/workouts/app_bar.dart
@@ -26,7 +26,7 @@ enum _WorkoutAppBarOptions {
   contribute,
 }
 
-class WorkoutOverviewAppBar extends StatelessWidget with PreferredSizeWidget {
+class WorkoutOverviewAppBar extends StatelessWidget implements PreferredSizeWidget {
   @override
   Widget build(BuildContext context) {
     return AppBar(
diff --git a/pubspec.yaml b/pubspec.yaml
index 04d8178dd..804494966 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,7 +24,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.5.6+34
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -60,6 +60,9 @@ dependencies:
   fl_chart: ^0.62.0
   flutter_zxing: ^1.1.2
 
+dependency_overrides:
+  intl: any
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/test_driver/screenshot_driver.dart b/test_driver/screenshot_driver.dart
index 476709ee4..f98d10c7f 100644
--- a/test_driver/screenshot_driver.dart
+++ b/test_driver/screenshot_driver.dart
@@ -6,7 +6,7 @@ import 'package:integration_test/integration_test_driver_extended.dart';
 Future<void> main() async {
   try {
     await integrationDriver(
-      onScreenshot: (String screenshotName, List<int> screenshotBytes) async {
+      onScreenshot: (String screenshotName, List<int> screenshotBytes, [_]) async {
         final File image = await File(screenshotName).create(recursive: true);
         image.writeAsBytesSync(screenshotBytes);
         return true;