diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart
index 8db235ef3..df670b9ef 100644
--- a/lib/data/repositories/auth_repository.dart
+++ b/lib/data/repositories/auth_repository.dart
@@ -22,7 +22,7 @@ class AuthRepository {
       'password': password,
     };
 
-    final response = await webClient.post(url + '/login?include_static=true', '', json.encode(credentials));
+    final Future<dynamic> response = await webClient.post(url + '/login?include_static=true', '', json.encode(credentials));
     print(response);
     LoginResponse loginResponse = serializers.deserializeWith(
         LoginResponse.serializer, response);
diff --git a/lib/data/repositories/client_repository.dart b/lib/data/repositories/client_repository.dart
index 526d8d472..fa5bd6744 100644
--- a/lib/data/repositories/client_repository.dart
+++ b/lib/data/repositories/client_repository.dart
@@ -17,7 +17,7 @@ class ClientRepository {
 
   Future<BuiltList<ClientEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/clients', company.token);
 
     ClientListResponse clientResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class ClientRepository {
   Future saveData(CompanyEntity company, AuthState auth, ClientEntity client, [EntityAction action]) async {
 
     var data = serializers.serializeWith(ClientEntity.serializer, client);
-    var response;
+    Future<dynamic> response;
 
     if (client.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart
index 54f09184d..9bb842035 100644
--- a/lib/data/repositories/credit_repository.dart
+++ b/lib/data/repositories/credit_repository.dart
@@ -17,7 +17,7 @@ class CreditsRepository {
 
   Future<BuiltList<CreditEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/credits?per_page=500', company.token);
 
     CreditListResponse creditResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class CreditsRepository {
   Future saveData(CompanyEntity company, AuthState auth, CreditEntity credit, [EntityAction action]) async {
 
     var data = serializers.serializeWith(CreditEntity.serializer, credit);
-    var response;
+    Future<dynamic> response;
 
     if (credit.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/dashboard_repository.dart b/lib/data/repositories/dashboard_repository.dart
index 5cf33f719..ed046b773 100644
--- a/lib/data/repositories/dashboard_repository.dart
+++ b/lib/data/repositories/dashboard_repository.dart
@@ -14,7 +14,7 @@ class DashboardRepository {
 
   Future<DashboardEntity> loadItem(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/dashboard', company.token);
 
     DashboardResponse dashboardResponse = serializers.deserializeWith(
diff --git a/lib/data/repositories/expense_repository.dart b/lib/data/repositories/expense_repository.dart
index 5f31d09a9..31cf8f21f 100644
--- a/lib/data/repositories/expense_repository.dart
+++ b/lib/data/repositories/expense_repository.dart
@@ -17,7 +17,7 @@ class ExpenseRepository {
 
   Future<BuiltList<ExpenseEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/expenses?per_page=500', company.token);
 
     ExpenseListResponse expenseResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class ExpenseRepository {
   Future saveData(CompanyEntity company, AuthState auth, ExpenseEntity expense, [EntityAction action]) async {
 
     var data = serializers.serializeWith(ExpenseEntity.serializer, expense);
-    var response;
+    Future<dynamic> response;
 
     if (expense.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart
index 1a36bc034..11f4d7f50 100644
--- a/lib/data/repositories/invoice_repository.dart
+++ b/lib/data/repositories/invoice_repository.dart
@@ -17,7 +17,7 @@ class InvoiceRepository {
 
   Future<BuiltList<InvoiceEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/invoices?include=invitations', company.token);
 
     InvoiceListResponse invoiceResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class InvoiceRepository {
   Future saveData(CompanyEntity company, AuthState auth, InvoiceEntity invoice, [EntityAction action]) async {
 
     var data = serializers.serializeWith(InvoiceEntity.serializer, invoice);
-    var response;
+    Future<dynamic> response;
 
     if (invoice.isNew) {
       response = await webClient.post(
@@ -50,7 +50,7 @@ class InvoiceRepository {
 
   Future emailInvoice(CompanyEntity company, AuthState auth, InvoiceEntity invoice) async {
 
-    var response = await webClient.post(
+    final Future<dynamic> response = await webClient.post(
           auth.url + '/email_invoice?invoice_id=${invoice.id}', company.token, null);
 
     InvoiceItemResponse invoiceResponse = serializers.deserializeWith(
diff --git a/lib/data/repositories/payment_repository.dart b/lib/data/repositories/payment_repository.dart
index 0cf39e88f..95eaa4c5a 100644
--- a/lib/data/repositories/payment_repository.dart
+++ b/lib/data/repositories/payment_repository.dart
@@ -17,7 +17,7 @@ class PaymentsRepository {
 
   Future<BuiltList<PaymentEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/payments?per_page=500', company.token);
 
     PaymentListResponse paymentResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class PaymentsRepository {
   Future saveData(CompanyEntity company, AuthState auth, PaymentEntity payment, [EntityAction action]) async {
 
     var data = serializers.serializeWith(PaymentEntity.serializer, payment);
-    var response;
+    Future<dynamic> response;
 
     if (payment.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/product_repository.dart b/lib/data/repositories/product_repository.dart
index 4cc6fcaac..7b5bd8484 100644
--- a/lib/data/repositories/product_repository.dart
+++ b/lib/data/repositories/product_repository.dart
@@ -17,7 +17,7 @@ class ProductRepository {
 
   Future<BuiltList<ProductEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/products', company.token);
 
     ProductListResponse productResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class ProductRepository {
   Future saveData(CompanyEntity company, AuthState auth, ProductEntity product, [EntityAction action]) async {
 
     var data = serializers.serializeWith(ProductEntity.serializer, product);
-    var response;
+    Future<dynamic> response;
 
     if (product.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/project_repository.dart b/lib/data/repositories/project_repository.dart
index 9d371d497..26a7dc133 100644
--- a/lib/data/repositories/project_repository.dart
+++ b/lib/data/repositories/project_repository.dart
@@ -17,7 +17,7 @@ class ProjectsRepository {
 
   Future<BuiltList<ProjectEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/projects?per_page=500', company.token);
 
     ProjectListResponse projectResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class ProjectsRepository {
   Future saveData(CompanyEntity company, AuthState auth, ProjectEntity project, [EntityAction action]) async {
 
     var data = serializers.serializeWith(ProjectEntity.serializer, project);
-    var response;
+    Future<dynamic> response;
 
     if (project.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/static/static_repository.dart b/lib/data/repositories/static/static_repository.dart
index d85633eeb..d5d2728f0 100644
--- a/lib/data/repositories/static/static_repository.dart
+++ b/lib/data/repositories/static/static_repository.dart
@@ -15,7 +15,7 @@ class StaticRepository {
 
   Future<StaticDataEntity> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/static', company.token);
 
     StaticDataItemResponse staticDataResponse = serializers.deserializeWith(
diff --git a/lib/data/repositories/task_repository.dart b/lib/data/repositories/task_repository.dart
index b1d08b078..817ea204c 100644
--- a/lib/data/repositories/task_repository.dart
+++ b/lib/data/repositories/task_repository.dart
@@ -17,7 +17,7 @@ class TasksRepository {
 
   Future<BuiltList<TaskEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/tasks?per_page=500', company.token);
 
     TaskListResponse taskResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class TasksRepository {
   Future saveData(CompanyEntity company, AuthState auth, TaskEntity task, [EntityAction action]) async {
 
     var data = serializers.serializeWith(TaskEntity.serializer, task);
-    var response;
+    Future<dynamic> response;
 
     if (task.isNew) {
       response = await webClient.post(
diff --git a/lib/data/repositories/vendor_repository.dart b/lib/data/repositories/vendor_repository.dart
index 09e99dff8..3f0941915 100644
--- a/lib/data/repositories/vendor_repository.dart
+++ b/lib/data/repositories/vendor_repository.dart
@@ -17,7 +17,7 @@ class VendorRepository {
 
   Future<BuiltList<VendorEntity>> loadList(CompanyEntity company, AuthState auth) async {
 
-    final response = await webClient.get(
+    final Future<dynamic> response = await webClient.get(
         auth.url + '/vendors?per_page=500', company.token);
 
     VendorListResponse vendorResponse = serializers.deserializeWith(
@@ -29,7 +29,7 @@ class VendorRepository {
   Future saveData(CompanyEntity company, AuthState auth, VendorEntity vendor, [EntityAction action]) async {
 
     var data = serializers.serializeWith(VendorEntity.serializer, vendor);
-    var response;
+    Future<dynamic> response;
 
     if (vendor.isNew) {
       response = await webClient.post(
diff --git a/lib/data/web_client.dart b/lib/data/web_client.dart
index 04aa9c6d7..434967c8d 100644
--- a/lib/data/web_client.dart
+++ b/lib/data/web_client.dart
@@ -37,7 +37,7 @@ class WebClient {
       throw _parseError(response.body);
     }
 
-    final jsonResponse = json.decode(response.body);
+    final dynamic jsonResponse = json.decode(response.body);
 
     //print(jsonResponse);
 
@@ -59,7 +59,7 @@ class WebClient {
     }
 
     try {
-      final jsonResponse = json.decode(response.body);
+      final dynamic jsonResponse = json.decode(response.body);
       return jsonResponse;
     } catch (exception) {
       print(response.body);
@@ -82,7 +82,7 @@ class WebClient {
     }
 
     try {
-      final jsonResponse = json.decode(response.body);
+      final dynamic jsonResponse = json.decode(response.body);
       return jsonResponse;
     } catch (exception) {
       print(response.body);
diff --git a/lib/main.dart b/lib/main.dart
index 82cc3fb30..ee20aea4d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -39,7 +39,7 @@ void main() {
         ..addAll(createStoreInvoicesMiddleware())
         ..addAll(createStorePersistenceMiddleware())
         ..addAll([
-          LoggingMiddleware.printer(),
+          LoggingMiddleware<dynamic>.printer(),
         ]));
 
   runApp(InvoiceNinjaApp(store: store));
diff --git a/lib/ui/app/app_bottom_bar.dart b/lib/ui/app/app_bottom_bar.dart
index 624889339..88fe5887e 100644
--- a/lib/ui/app/app_bottom_bar.dart
+++ b/lib/ui/app/app_bottom_bar.dart
@@ -40,7 +40,7 @@ class _AppBottomBarState extends State<AppBottomBar> {
         return;
       }
 
-      _filterController = Scaffold.of(context).showBottomSheet((context) {
+      _filterController = Scaffold.of(context).showBottomSheet<StoreConnector>((context) {
         return StoreConnector<AppState, BuiltList<EntityState>>(
           //distinct: true,
           converter: (Store<AppState> store) => store.state.getListState(widget.entityType).stateFilters,
@@ -95,7 +95,7 @@ class _AppBottomBarState extends State<AppBottomBar> {
         return;
       }
 
-      _sortController  = Scaffold.of(context).showBottomSheet((context) {
+      _sortController  = Scaffold.of(context).showBottomSheet<StoreConnector>((context) {
         return StoreConnector<AppState, ListUIState>(
           //distinct: true,
           converter: (Store<AppState> store) => store.state.getListState(widget.entityType),
diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart
index f8dcb9e04..b6a5e5ce8 100644
--- a/lib/ui/app/entity_dropdown.dart
+++ b/lib/ui/app/entity_dropdown.dart
@@ -103,7 +103,7 @@ class _EntityDropdownState extends State<EntityDropdown> {
           }).toList());
     }
 
-    showDialog(
+    showDialog<Padding>(
         context: context,
         builder: (BuildContext context) {
           return Padding(
diff --git a/lib/ui/app/forms/date_picker.dart b/lib/ui/app/forms/date_picker.dart
index ad62a7ce3..01948de26 100644
--- a/lib/ui/app/forms/date_picker.dart
+++ b/lib/ui/app/forms/date_picker.dart
@@ -8,7 +8,7 @@ class DatePicker extends StatefulWidget {
     @required this.labelText,
     @required this.onSelected,
     @required this.selectedDate,
-    @required this.validator,
+    this.validator,
   });
 
   final String labelText;
diff --git a/lib/ui/client/edit/client_edit_contacts.dart b/lib/ui/client/edit/client_edit_contacts.dart
index 7a1b2aa66..55d90b9a1 100644
--- a/lib/ui/client/edit/client_edit_contacts.dart
+++ b/lib/ui/client/edit/client_edit_contacts.dart
@@ -116,7 +116,7 @@ class ContactEditDetailsState extends State<ContactEditDetails> {
     var localization = AppLocalization.of(context);
 
     _confirmDelete() {
-      showDialog(
+      showDialog<AlertDialog>(
         context: context,
         builder: (BuildContext context) => AlertDialog(
               semanticLabel: localization.areYouSure,
diff --git a/lib/ui/client/edit/client_edit_vm.dart b/lib/ui/client/edit/client_edit_vm.dart
index 8c66d7a91..0e88cd681 100644
--- a/lib/ui/client/edit/client_edit_vm.dart
+++ b/lib/ui/client/edit/client_edit_vm.dart
@@ -79,7 +79,7 @@ class ClientEditVM {
               Navigator.of(context).pop();
               Navigator
                   .of(context)
-                  .push(MaterialPageRoute(builder: (_) => ClientViewScreen()));
+                  .push<ClientViewScreen>(MaterialPageRoute(builder: (_) => ClientViewScreen()));
             } else {
               Navigator.of(context).pop();
             }
diff --git a/lib/ui/client/view/client_view.dart b/lib/ui/client/view/client_view.dart
index 3c0b29abc..b10f19ebc 100644
--- a/lib/ui/client/view/client_view.dart
+++ b/lib/ui/client/view/client_view.dart
@@ -91,7 +91,7 @@ class _ClientViewState extends State<ClientView>
         floatingActionButton: FloatingActionButton(
           backgroundColor: Theme.of(context).primaryColorDark,
           onPressed: () {
-            showDialog(
+            showDialog<SimpleDialog>(
               context: context,
               builder: (BuildContext context) =>
                   SimpleDialog(children: <Widget>[
diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart
index 36693143f..5a8bce92f 100644
--- a/lib/ui/invoice/edit/invoice_edit_items.dart
+++ b/lib/ui/invoice/edit/invoice_edit_items.dart
@@ -120,7 +120,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> with AutomaticKeepAliv
     var localization = AppLocalization.of(context);
 
     _confirmDelete() {
-      showDialog(
+      showDialog<AlertDialog>(
         context: context,
         builder: (BuildContext context) => AlertDialog(
               semanticLabel: localization.areYouSure,
diff --git a/lib/ui/invoice/edit/invoice_edit_vm.dart b/lib/ui/invoice/edit/invoice_edit_vm.dart
index 364a241c5..bb4b92fa6 100644
--- a/lib/ui/invoice/edit/invoice_edit_vm.dart
+++ b/lib/ui/invoice/edit/invoice_edit_vm.dart
@@ -74,7 +74,7 @@ class InvoiceEditVM {
               Navigator.of(context).pop();
               Navigator
                   .of(context)
-                  .push(MaterialPageRoute(builder: (_) => InvoiceViewScreen()));
+                  .push<InvoiceViewScreen>(MaterialPageRoute(builder: (_) => InvoiceViewScreen()));
             } else {
               Navigator.of(context).pop();
             }
diff --git a/lib/ui/invoice/view/invoice_view_vm.dart b/lib/ui/invoice/view/invoice_view_vm.dart
index 3e54d2ba5..aa7cbb26e 100644
--- a/lib/ui/invoice/view/invoice_view_vm.dart
+++ b/lib/ui/invoice/view/invoice_view_vm.dart
@@ -63,8 +63,8 @@ class InvoiceViewVM {
 
     Future<Null> _viewPdf(BuildContext context) async {
       var localization = AppLocalization.of(context);
-      var url;
-      var useWebView;
+      String url;
+      bool useWebView;
 
       if (Theme.of(context).platform == TargetPlatform.iOS) {
         url = invoice.invitationSilentLink;
@@ -96,7 +96,7 @@ class InvoiceViewVM {
         },
         onActionSelected: (BuildContext context, EntityAction action) {
           final Completer<Null> completer = new Completer<Null>();
-          var message;
+          String message;
           switch (action) {
             case EntityAction.pdf:
               _viewPdf(context);
diff --git a/lib/utils/formatting.dart b/lib/utils/formatting.dart
index 56f350964..aca859297 100644
--- a/lib/utils/formatting.dart
+++ b/lib/utils/formatting.dart
@@ -36,8 +36,8 @@ String formatNumber(
   ClientEntity client = state.selectedCompanyState.clientState.map[clientId];
 
   //var countryId = client?.countryId ?? company.countryId;
-  var currencyId;
-  var countryId = client?.countryId ?? 1;
+  int currencyId;
+  int countryId = client?.countryId ?? 1;
 
   if (client != null && client.currencyId > 0) {
     currencyId = client.currencyId;
@@ -73,7 +73,7 @@ String formatNumber(
     MINUS_SIGN: '-',
   );
 
-  var formatter;
+  NumberFormat formatter;
   String formatted;
 
   if (formatNumberType == FormatNumberType.int) {
diff --git a/samples/form_redux.dart b/samples/form_redux.dart
index e460b5fc3..543f596f8 100644
--- a/samples/form_redux.dart
+++ b/samples/form_redux.dart
@@ -96,7 +96,7 @@ AppState reducer(AppState state, dynamic action) {
 void main() {
   final store =
       Store<AppState>(reducer, initialState: AppState.init(), middleware: [
-    LoggingMiddleware.printer(),
+    LoggingMiddleware<dynamic>.printer(),
   ]);
 
   runApp(MyApp(store: store));