diff --git a/lib/screens/githostsetup_screens.dart b/lib/screens/githostsetup_screens.dart
index 752b5419..5f9ec735 100644
--- a/lib/screens/githostsetup_screens.dart
+++ b/lib/screens/githostsetup_screens.dart
@@ -402,7 +402,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
   Future _removeExistingClone(String baseDirPath) async {
     var baseDir = Directory(p.join(baseDirPath, "journal"));
     var dotGitDir = Directory(p.join(baseDir.path, ".git"));
-    bool exists = await dotGitDir.exists();
+    bool exists = dotGitDir.existsSync();
     if (exists) {
       Fimber.d("Removing " + baseDir.path);
       await baseDir.delete(recursive: true);
diff --git a/lib/state_container.dart b/lib/state_container.dart
index a3b113e3..dee76a7f 100644
--- a/lib/state_container.dart
+++ b/lib/state_container.dart
@@ -21,8 +21,8 @@ class StateContainer extends StatefulWidget {
   });
 
   static StateContainerState of(BuildContext context) {
-    return (context.inheritFromWidgetOfExactType(_InheritedStateContainer)
-            as _InheritedStateContainer)
+    return context
+        .dependOnInheritedWidgetOfExactType<_InheritedStateContainer>()
         .data;
   }
 
@@ -75,7 +75,7 @@ class StateContainerState extends State<StateContainer> {
         p.join(appState.gitBaseDirectory, appState.remoteGitRepoFolderName));
     var dotGitDir = Directory(p.join(remoteGitDir.path, ".git"));
 
-    bool exists = await dotGitDir.exists();
+    bool exists = dotGitDir.existsSync();
     if (exists) {
       await remoteGitDir.delete(recursive: true);
     }
diff --git a/lib/widgets/app_drawer.dart b/lib/widgets/app_drawer.dart
index 83fedc05..9831cb68 100644
--- a/lib/widgets/app_drawer.dart
+++ b/lib/widgets/app_drawer.dart
@@ -50,12 +50,12 @@ class AppDrawer extends StatelessWidget {
             decoration: BoxDecoration(
               color: Theme.of(context).highlightColor,
             ),
-            child: Padding(
-              padding: const EdgeInsets.all(8.0),
+            child: const Padding(
+              padding: EdgeInsets.all(8.0),
               child: DecoratedBox(
                 decoration: BoxDecoration(
                   image: DecorationImage(
-                    image: const AssetImage('assets/icon/icon.png'),
+                    image: AssetImage('assets/icon/icon.png'),
                   ),
                 ),
               ),