diff --git a/workflow/engine/classes/WorkspaceTools.php b/workflow/engine/classes/WorkspaceTools.php
index 574077689..1d63bfe4d 100644
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -832,6 +832,16 @@ class WorkspaceTools
             $description = $database->executeQuery($database->generateDescTableSQL($table));
             $oldSchema[$table] = [];
             foreach ($description as $field) {
+                $type = $field['Type'];
+                if ($type === "int") {
+                    $field['Type'] = $type . "(11)";
+                }
+                if ($type === "tinyint") {
+                    $field['Type'] = $type . "(4)";
+                }
+                if ($type === "bigint") {
+                    $field['Type'] = $type . "(20)";
+                }
                 $oldSchema[$table][$field['Field']]['Field'] = $field['Field'];
                 $oldSchema[$table][$field['Field']]['Type'] = $field['Type'];
                 $oldSchema[$table][$field['Field']]['Null'] = $field['Null'];
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index e0f4d9d57..a2ec5e0ca 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -4316,7 +4316,7 @@
         <column name="VAR_LABEL" type="VARCHAR" size="255" default=""/>
         <column name="VAR_DBCONNECTION" type="VARCHAR" size="32"/>
         <column name="VAR_SQL" type="LONGVARCHAR"/>
-        <column name="VAR_NULL" type="TINYINT" size="32" default="0"/>
+        <column name="VAR_NULL" type="TINYINT" default="0"/>
         <column name="VAR_DEFAULT" type="VARCHAR" size="32" default=""/>
         <column name="VAR_ACCEPTED_VALUES" type="LONGVARCHAR"/>
         <column name="INP_DOC_UID" type="VARCHAR" size="32" default=""/>
@@ -6051,10 +6051,10 @@
         <column name="id" type="BIGINT" size="20" required="true" autoIncrement="true" primaryKey="true"/>
         <column name="queue" type="VARCHAR" size="255" required="true"/>
         <column name="payload" type="LONGVARCHAR" required="true"/>
-        <column name="attempts" type="TINYINT" size="3" required="true"/>
-        <column name="reserved_at" type="BIGINT" size="10" required="false"/>
-        <column name="available_at" type="BIGINT" size="10" required="true"/>
-        <column name="created_at" type="BIGINT" size="10" required="true"/>
+        <column name="attempts" type="TINYINT" required="true"/>
+        <column name="reserved_at" type="BIGINT" size="20" required="false"/>
+        <column name="available_at" type="BIGINT" size="20" required="true"/>
+        <column name="created_at" type="BIGINT" size="20" required="true"/>
         <index name="jobs_queue_index">
             <index-column name="queue"/>
         </index>
@@ -6088,9 +6088,9 @@
         <column name="body" type="VARCHAR"  size="255" required="false"/>
         <column name="type" type="VARCHAR"  size="255" required="false"/>
         <column name="category" type="VARCHAR"  size="255" required="false"/>
-        <column name="system" type="TINYINT"  size="3" required="false"/>
+        <column name="system" type="TINYINT" required="false"/>
         <column name="timezone" type="VARCHAR"  size="255" required="false"/>
-        <column name="enable" type="TINYINT"  size="3" required="false"/>
+        <column name="enable" type="TINYINT" required="false"/>
         <column name="creation_date" type="TIMESTAMP" required="false"/>
         <column name="last_update" type="TIMESTAMP" required="false"/>
     </table>
diff --git a/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue b/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue
index 03b361b8e..45315dc41 100644
--- a/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue
+++ b/workflow/engine/methods/authenticationSources/src/components/formAuthenticationSources.vue
@@ -488,11 +488,11 @@
                     gridText: JSON.stringify(gridText),
                     signInPolicyForLDAP: row.AUTH_SOURCE_SIGNIN_POLICY_FOR_LDAP,
                     inactiveUsers: row.AUTH_SOURCE_RETIRED_OU,
-                    role: row.USR_ROLE,
-                    groupIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_GROUP,
-                    userClassIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_CLASS,
-                    groupClassIdentifier: row.GROUP_CLASS_IDENTIFIER,
-                    departmentClassIdentifier: row.DEPARTMENT_CLASS_IDENTIFIER
+                    role: row.USR_ROLE || "",
+                    groupIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_GROUP || "",
+                    userClassIdentifier: row.AUTH_SOURCE_IDENTIFIER_FOR_USER_CLASS || "",
+                    groupClassIdentifier: row.GROUP_CLASS_IDENTIFIER || "",
+                    departmentClassIdentifier: row.DEPARTMENT_CLASS_IDENTIFIER || ""
                 };
                 return obj;
             },
diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
index 5ddd6ac05..1c6451f6d 100644
--- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
@@ -408,17 +408,19 @@ class Bpmn extends Handler
             $project->delete();
         }
 
-        $process = new Processes();
-        $repTable = $process->getReportTables($this->getUid());
-        $rows = [];
-        foreach ($repTable as $table) {
-            array_push($rows, ["id" => $table["ADD_TAB_UID"], "type" => ""]);
-        }
-        if (!empty($rows)) {
-            $httpData = (object)[];
-            $httpData->rows = json_encode($rows);
-            $repTable = new pmTablesProxy();
-            $repTable->delete($httpData);
+        if (!$force) {
+            $process = new Processes();
+            $repTable = $process->getReportTables($this->getUid());
+            $rows = [];
+            foreach ($repTable as $table) {
+                array_push($rows, ["id" => $table["ADD_TAB_UID"], "type" => ""]);
+            }
+            if (!empty($rows)) {
+                $httpData = (object)[];
+                $httpData->rows = json_encode($rows);
+                $repTable = new pmTablesProxy();
+                $repTable->delete($httpData);
+            }
         }
 
         self::log("Remove Project Success!");
@@ -1689,5 +1691,4 @@ class Bpmn extends Handler
             throw $e;
         }
     }
-
 }