diff --git a/lib/features/control_room/containers/data/datasources/containers_datasource.dart b/lib/features/control_room/containers/data/datasources/containers_datasource.dart
index c894e75..e6b06e5 100644
--- a/lib/features/control_room/containers/data/datasources/containers_datasource.dart
+++ b/lib/features/control_room/containers/data/datasources/containers_datasource.dart
@@ -46,7 +46,7 @@ class ContainersDatasource {
     final response = await _dio.get<String>(
       '/infrastructure/containers/$id/logs',
       queryParameters: {
-        if (tail != null) 'tail': tail,
+        'tail': ?tail,
         'timestamps': timestamps,
       },
     );
diff --git a/lib/features/front_hall/presentation/widgets/dashboard_content.dart b/lib/features/front_hall/presentation/widgets/dashboard_content.dart
index 2148172..b510be2 100644
--- a/lib/features/front_hall/presentation/widgets/dashboard_content.dart
+++ b/lib/features/front_hall/presentation/widgets/dashboard_content.dart
@@ -30,10 +30,7 @@ class _DashboardContentState extends ConsumerState<DashboardContent> {
 
   /// Tracks if we've logged the environment API user (log once per session)
   static bool _hasLoggedEnvUser = false;
-  static String? _envApiUser;
 
-  /// Get the environment API user (available after first load)
-  static String? get envApiUser => _envApiUser;
 
   @override
   void initState() {
@@ -157,9 +154,8 @@ class _DashboardContentState extends ConsumerState<DashboardContent> {
         const SizedBox(height: 8),
         environmentAsync.when(
           data: (envData) {
-            // Store and log user once per session
+            // Log the user once per session
             if (!_hasLoggedEnvUser && envData.user != null) {
-              _envApiUser = envData.user;
               _hasLoggedEnvUser = true;
               debugPrint('Environment API user: ${envData.user}');
             }
diff --git a/lib/shared/widgets/entity_page.dart b/lib/shared/widgets/entity_page.dart
index ae0c201..faa3bea 100644
--- a/lib/shared/widgets/entity_page.dart
+++ b/lib/shared/widgets/entity_page.dart
@@ -150,7 +150,7 @@ class EntitySection extends StatelessWidget {
                     ),
               ),
             ),
-            if (trailing != null) trailing!,
+            ?trailing,
           ],
         ),
         const SizedBox(height: 8),
diff --git a/test/shared/components/data_grid/data_grid_test.dart b/test/shared/components/data_grid/data_grid_test.dart
index fd9f142..4163b82 100644
--- a/test/shared/components/data_grid/data_grid_test.dart
+++ b/test/shared/components/data_grid/data_grid_test.dart
@@ -395,7 +395,7 @@ void main() {
       const mode = DataGridDataMode.infinite();
       expect(mode, isA<InfiniteDataMode>());
       expect((mode as InfiniteDataMode).initialLoad, 50);
-      expect((mode as InfiniteDataMode).loadMoreThreshold, 10);
+      expect(mode.loadMoreThreshold, 10);
     });
 
     test('infinite mode with custom values', () {
@@ -404,7 +404,7 @@ void main() {
         loadMoreThreshold: 20,
       );
       expect((mode as InfiniteDataMode).initialLoad, 100);
-      expect((mode as InfiniteDataMode).loadMoreThreshold, 20);
+      expect(mode.loadMoreThreshold, 20);
     });
   });
 }