diff --git a/lib/models/Site.dart b/lib/models/Site.dart
index 9d3bbe3..20d8d98 100644
--- a/lib/models/Site.dart
+++ b/lib/models/Site.dart
@@ -15,7 +15,7 @@ class Site {
   late EventChannel _updates;
 
   /// Signals that something about this site has changed. onError is called with an error string if there was an error
-  StreamController _change = StreamController.broadcast();
+  final StreamController _change = StreamController.broadcast();
 
   // Identifiers
   late String name;
diff --git a/lib/screens/siteConfig/StaticHostsScreen.dart b/lib/screens/siteConfig/StaticHostsScreen.dart
index 8bc7ed8..49c0c5d 100644
--- a/lib/screens/siteConfig/StaticHostsScreen.dart
+++ b/lib/screens/siteConfig/StaticHostsScreen.dart
@@ -32,7 +32,7 @@ class StaticHostsScreen extends StatefulWidget {
 }
 
 class _StaticHostsScreenState extends State<StaticHostsScreen> {
-  Map<Key, _Hostmap> _hostmap = {};
+  final Map<Key, _Hostmap> _hostmap = {};
   bool changed = false;
 
   @override
diff --git a/lib/services/settings.dart b/lib/services/settings.dart
index 67c802d..1646109 100644
--- a/lib/services/settings.dart
+++ b/lib/services/settings.dart
@@ -10,7 +10,7 @@ bool DEFAULT_TRACK_ERRORS = true;
 
 class Settings {
   final _storage = Storage();
-  StreamController _change = StreamController.broadcast();
+  final StreamController _change = StreamController.broadcast();
   var _settings = Map<String, dynamic>();
 
   bool get useSystemColors {