diff --git a/lib/redux/reports/reports_selectors.dart b/lib/redux/reports/reports_selectors.dart
index 55647947c..71f4bcb48 100644
--- a/lib/redux/reports/reports_selectors.dart
+++ b/lib/redux/reports/reports_selectors.dart
@@ -1,7 +1,6 @@
 import 'package:built_collection/built_collection.dart';
 import 'package:invoiceninja_flutter/data/models/client_model.dart';
 import 'package:invoiceninja_flutter/data/models/company_model.dart';
-import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/data/models/invoice_model.dart';
 import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
index 36ef83f65..8ec92efa9 100644
--- a/lib/ui/reports/reports_screen.dart
+++ b/lib/ui/reports/reports_screen.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/constants.dart';
-import 'package:invoiceninja_flutter/data/models/dashboard_model.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
@@ -10,7 +9,6 @@ import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/ui/app/dialogs/multiselect_dialog.dart';
 import 'package:invoiceninja_flutter/ui/app/form_card.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
-import 'package:invoiceninja_flutter/ui/app/forms/date_picker.dart';
 import 'package:invoiceninja_flutter/ui/app/history_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/app/menu_drawer_vm.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen_vm.dart';
@@ -127,14 +125,13 @@ class ReportsScreen extends StatelessWidget {
                   return FlatButton(
                     child: Text(localization.editColumns.toUpperCase()),
                     onPressed: () {
-                      print('## Bulder: selected: ${reportResult.columns}');
                       multiselectDialog(
                         context: context,
                         onSelected: (selected) {
                           viewModel.onReportColumnsChanged(context, selected);
                         },
                         options: reportResult.allColumns,
-                        selected: reportResult.columns,
+                        selected: reportResult.columns.toList(),
                         title: localization.editColumns,
                         addTitle: localization.addColumn,
                       );
diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart
index 02d294aed..db98b8cf7 100644
--- a/lib/ui/reports/reports_screen_vm.dart
+++ b/lib/ui/reports/reports_screen_vm.dart
@@ -6,9 +6,7 @@ import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/dashboard_model.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/redux/reports/reports_actions.dart';
-import 'package:invoiceninja_flutter/redux/reports/reports_selectors.dart';
 import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
-import 'package:invoiceninja_flutter/ui/app/app_builder.dart';
 import 'package:invoiceninja_flutter/ui/reports/client_report.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
diff --git a/lib/utils/completers.dart b/lib/utils/completers.dart
index 4b82d67b8..04af06f80 100644
--- a/lib/utils/completers.dart
+++ b/lib/utils/completers.dart
@@ -28,14 +28,13 @@ Completer<Null> refreshCompleter(BuildContext context) {
 
 Completer<T> snackBarCompleter<T>(BuildContext context, String message,
     {bool shouldPop = false}) {
-  final scaffold = Scaffold.of(context);
   final Completer<T> completer = Completer<T>();
 
   completer.future.then((_) {
     if (shouldPop) {
       Navigator.of(context).pop();
     }
-    scaffold.showSnackBar(SnackBar(
+    Scaffold.of(context).showSnackBar(SnackBar(
         content: SnackBarRow(
       message: message,
     )));