diff --git a/lib/ui/client/edit/client_edit_settings.dart b/lib/ui/client/edit/client_edit_settings.dart
index 3256b2c48..c6753a614 100644
--- a/lib/ui/client/edit/client_edit_settings.dart
+++ b/lib/ui/client/edit/client_edit_settings.dart
@@ -138,7 +138,7 @@ class ClientEditSettingsState extends State<ClientEditSettings> {
             ),
             TextFormField(
               controller: _taskRateController,
-              keyboardType: TextInputType.number,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
               decoration: InputDecoration(
                 labelText: localization.taskRate,
               ),
diff --git a/lib/ui/invoice/edit/invoice_edit_details.dart b/lib/ui/invoice/edit/invoice_edit_details.dart
index ed949f5a3..860b0f049 100644
--- a/lib/ui/invoice/edit/invoice_edit_details.dart
+++ b/lib/ui/invoice/edit/invoice_edit_details.dart
@@ -193,7 +193,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
               decoration: InputDecoration(
                 labelText: localization.partialDeposit,
               ),
-              keyboardType: TextInputType.number,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
             ),
             invoice.partial != null && invoice.partial > 0
                 ? DatePicker(
@@ -221,7 +221,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
                     decoration: InputDecoration(
                       labelText: localization.discount,
                     ),
-                    keyboardType: TextInputType.number,
+                    keyboardType: TextInputType.numberWithOptions(decimal: true),
                   ),
                 ),
                 const SizedBox(
@@ -274,7 +274,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
                       labelText: company
                           .getCustomFieldLabel(CustomFieldType.surcharge1),
                     ),
-                    keyboardType: TextInputType.number,
+                    keyboardType: TextInputType.numberWithOptions(decimal: true),
                   )
                 : Container(),
             company.getCustomFieldLabel(CustomFieldType.surcharge2).isNotEmpty
@@ -284,7 +284,7 @@ class InvoiceEditDetailsState extends State<InvoiceEditDetails> {
                       labelText: company
                           .getCustomFieldLabel(CustomFieldType.surcharge2),
                     ),
-                    keyboardType: TextInputType.number,
+                    keyboardType: TextInputType.numberWithOptions(decimal: true),
                   )
                 : Container(),
             company.enableInvoiceTaxes
diff --git a/lib/ui/invoice/edit/invoice_edit_items.dart b/lib/ui/invoice/edit/invoice_edit_items.dart
index 28d2a859a..affe0887c 100644
--- a/lib/ui/invoice/edit/invoice_edit_items.dart
+++ b/lib/ui/invoice/edit/invoice_edit_items.dart
@@ -237,7 +237,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
             ),
             TextFormField(
               controller: _costController,
-              keyboardType: TextInputType.number,
+              keyboardType: TextInputType.numberWithOptions(decimal: true),
               decoration: InputDecoration(
                 labelText: localization.unitCost,
               ),
@@ -245,7 +245,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
             company.hasInvoiceField('quantity')
                 ? TextFormField(
                     controller: _qtyController,
-                    keyboardType: TextInputType.number,
+                    keyboardType: TextInputType.numberWithOptions(decimal: true),
                     decoration: InputDecoration(
                       labelText: localization.quantity,
                     ),
@@ -254,7 +254,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
             company.hasInvoiceField('discount')
                 ? TextFormField(
                     controller: _discountController,
-                    keyboardType: TextInputType.number,
+                    keyboardType: TextInputType.numberWithOptions(decimal: true),
                     decoration: InputDecoration(
                       labelText: localization.discount,
                     ),
diff --git a/lib/ui/payment/edit/payment_edit.dart b/lib/ui/payment/edit/payment_edit.dart
index 080fe3199..5bfb931af 100644
--- a/lib/ui/payment/edit/payment_edit.dart
+++ b/lib/ui/payment/edit/payment_edit.dart
@@ -178,7 +178,7 @@ class _PaymentEditState extends State<PaymentEdit> {
                         ? TextFormField(
                             controller: _amountController,
                             autocorrect: false,
-                            keyboardType: TextInputType.number,
+                            keyboardType: TextInputType.numberWithOptions(decimal: true),
                             decoration: InputDecoration(
                               labelText: localization.amount,
                             ),
diff --git a/lib/ui/product/edit/product_edit.dart b/lib/ui/product/edit/product_edit.dart
index 7e00ed905..99e6e7094 100644
--- a/lib/ui/product/edit/product_edit.dart
+++ b/lib/ui/product/edit/product_edit.dart
@@ -184,7 +184,7 @@ class _ProductEditState extends State<ProductEdit> {
                   TextFormField(
                     key: Key(ProductKeys.cost),
                     controller: _costController,
-                    keyboardType: TextInputType.number,
+                    keyboardType: TextInputType.numberWithOptions(decimal: true),
                     decoration: InputDecoration(
                       labelText: localization.cost,
                     ),
diff --git a/lib/ui/project/edit/project_edit.dart b/lib/ui/project/edit/project_edit.dart
index d4ba819ce..b825853d2 100644
--- a/lib/ui/project/edit/project_edit.dart
+++ b/lib/ui/project/edit/project_edit.dart
@@ -186,14 +186,14 @@ class _ProjectEditState extends State<ProjectEdit> {
                       },
                     ),
                     TextFormField(
-                      keyboardType: TextInputType.number,
+                      keyboardType: TextInputType.numberWithOptions(decimal: true),
                       controller: _hoursController,
                       decoration: InputDecoration(
                         labelText: localization.budgetedHours,
                       ),
                     ),
                     TextFormField(
-                      keyboardType: TextInputType.number,
+                      keyboardType: TextInputType.numberWithOptions(decimal: true),
                       controller: _taskRateController,
                       decoration: InputDecoration(
                         labelText: localization.taskRate,
diff --git a/lib/ui/task/view/task_view.dart b/lib/ui/task/view/task_view.dart
index 90de9257d..7d3fba4fa 100644
--- a/lib/ui/task/view/task_view.dart
+++ b/lib/ui/task/view/task_view.dart
@@ -59,7 +59,7 @@ class _TaskViewState extends State<TaskView> {
     // TODO Remove isNotEmpty check in v2
     if (company.taskStatusMap.isNotEmpty && (task.taskStatusId ?? 0) > 0) {
       fields[localization.status] =
-          company.taskStatusMap[task.taskStatusId].name ?? '';
+          company.taskStatusMap[task.taskStatusId]?.name ?? '';
     }
 
     if (task.customValue1.isNotEmpty) {