diff --git a/analysis_options.yaml b/analysis_options.yaml
index 8727159e..ac57e310 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -66,4 +66,8 @@ linter:
 
     require_trailing_commas: false
 
-    eol_at_end_of_file: false
\ No newline at end of file
+    eol_at_end_of_file: false
+
+    avoid_dynamic_calls: false
+
+    body_might_complete_normally_nullable: false
\ No newline at end of file
diff --git a/lib/api_form.dart b/lib/api_form.dart
index 252b5ee5..617aad27 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -1,4 +1,4 @@
-import "dart:ui";
+
 import "dart:io";
 
 import "package:intl/intl.dart";
diff --git a/lib/user_profile.dart b/lib/user_profile.dart
index 3aac40bf..251aa309 100644
--- a/lib/user_profile.dart
+++ b/lib/user_profile.dart
@@ -1,9 +1,7 @@
 
-/*
- * Class for InvenTree user / login details
- */
 import "package:sembast/sembast.dart";
-import "preferences.dart";
+
+import "package:inventree/preferences.dart";
 
 class UserProfile {
 
diff --git a/lib/widget/paginator.dart b/lib/widget/paginator.dart
index 9c6cfdec..c3343a77 100644
--- a/lib/widget/paginator.dart
+++ b/lib/widget/paginator.dart
@@ -70,9 +70,7 @@ class PaginatedSearchState<T extends StatefulWidget> extends State<T> {
 
       if (page != null) {
         for (var result in page.results) {
-          if (result is InvenTreeModel) {
             items.add(result);
-          }
         }
       }
 
diff --git a/pubspec.lock b/pubspec.lock
index 2b3aa96e..4fb3ba92 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -231,7 +231,7 @@ packages:
     source: hosted
     version: "0.6.4"
   flutter_cache_manager:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_cache_manager
       url: "https://pub.dartlang.org"
@@ -279,7 +279,7 @@ packages:
       name: font_awesome_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "10.1.0"
+    version: "9.2.0"
   http:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index bf5efaf4..02a016cc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,10 +29,9 @@ dependencies:
   device_info_plus: ^3.2.2                # Information about the device
   dropdown_search: ^0.6.3                  # Dropdown autocomplete form fields
   file_picker: ^4.5.1                     # Select files from the device
-
-
+  flutter_cache_manager: ^3.3.0
   flutter_markdown: ^0.6.9                # Rendering markdown
-  font_awesome_flutter: ^10.1.0            # FontAwesome icon set
+  font_awesome_flutter: ^9.1.0            # FontAwesome icon set
   http: ^0.13.4
   image_picker: ^0.8.3                    # Select or take photos
   infinite_scroll_pagination: ^3.1.0      # Let the server do all the work!