diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php
index feaa5a6bdbb0..76e593f9da80 100644
--- a/app/Http/Controllers/TaskStatusController.php
+++ b/app/Http/Controllers/TaskStatusController.php
@@ -42,8 +42,8 @@ class TaskStatusController extends BaseController
 
     /**
      *      @OA\Get(
-     *      path="/api/v1/task_status",
-     *      operationId="getTaskStatuss",
+     *      path="/api/v1/task_statuses",
+     *      operationId="getTaskStatuses",
      *      tags={"task_status"},
      *      summary="Gets a list of task statuses",
      *      description="Lists task statuses",
@@ -137,7 +137,7 @@ class TaskStatusController extends BaseController
      *
      *
      * @OA\Post(
-     *      path="/api/v1/task_status",
+     *      path="/api/v1/task_statuses",
      *      operationId="storeTaskStatus",
      *      tags={"task_status"},
      *      summary="Adds a TaskStatus",
diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php
index 520b4451a8d7..35ff9d450306 100644
--- a/app/Http/Requests/Expense/StoreExpenseRequest.php
+++ b/app/Http/Requests/Expense/StoreExpenseRequest.php
@@ -54,6 +54,10 @@ class StoreExpenseRequest extends Request
 
         $input = $this->decodePrimaryKeys($input);
 
+        if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
+            $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
+        }
+
         $this->replace($input);
     }
 
diff --git a/app/Http/Requests/Expense/UpdateExpenseRequest.php b/app/Http/Requests/Expense/UpdateExpenseRequest.php
index 06f42e6b414d..bdda97a3eb09 100644
--- a/app/Http/Requests/Expense/UpdateExpenseRequest.php
+++ b/app/Http/Requests/Expense/UpdateExpenseRequest.php
@@ -65,6 +65,10 @@ class UpdateExpenseRequest extends Request
 
         $input = $this->decodePrimaryKeys($input);
 
+        if (array_key_exists('category_id', $input) && is_string($input['category_id'])) {
+            $input['category_id'] = $this->decodePrimaryKey($input['category_id']);
+        }
+
         $this->replace($input);
     }
 }
diff --git a/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php b/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
index 4de8a3b06321..958fa48e5254 100644
--- a/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
+++ b/app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
@@ -33,7 +33,15 @@ class StoreExpenseCategoryRequest extends Request
 
         $rules['name'] = 'required|unique:expense_categories,name,null,null,company_id,'.auth()->user()->companyId();
 
-        return $rules;
+        return $this->globalRules($rules);
     }
 
+    protected function prepareForValidation()
+    {
+        $input = $this->all();
+
+        $input = $this->decodePrimaryKeys($input);
+
+        $this->replace($input);
+    }
 }
diff --git a/database/migrations/2020_10_28_224711_status_sort_order.php b/database/migrations/2020_10_28_224711_status_sort_order.php
new file mode 100644
index 000000000000..dc674e5c69ba
--- /dev/null
+++ b/database/migrations/2020_10_28_224711_status_sort_order.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class StatusSortOrder extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('tasks', function ($t){
+            $t->renameColumn('sort_order', 'status_sort_order');
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}