diff --git a/src/common/FakerMethods.js b/src/common/FakerMethods.js
index e401fa11..fe7c7ec4 100644
--- a/src/common/FakerMethods.js
+++ b/src/common/FakerMethods.js
@@ -134,7 +134,7 @@ export default class {
          { name: 'phoneNumberFormat', group: 'phone', types: ['string'] },
          { name: 'phoneFormats', group: 'phone', types: ['string'] },
 
-         { name: 'number', group: 'datatype', types: ['string', 'number'], params: ['min', 'max'] },
+         { name: 'number', group: 'random', types: ['string', 'number'], params: ['min', 'max'] },
          { name: 'float', group: 'random', types: ['string', 'float'], params: ['min', 'max'] },
          { name: 'arrayElement', group: 'random', types: ['string'] },
          { name: 'arrayElements', group: 'random', types: ['string'] },
diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
index d31e1be6..7d60c64f 100644
--- a/src/main/libs/clients/MySQLClient.js
+++ b/src/main/libs/clients/MySQLClient.js
@@ -114,7 +114,9 @@ export class MySQLClient extends AntaresCore {
          port: this._params.port,
          user: this._params.user,
          password: this._params.password,
-         ssl: null
+         ssl: null,
+         supportBigNumbers: true,
+         bigNumberStrings: true
       };
 
       if (this._params.schema?.length) dbConfig.database = this._params.schema;
diff --git a/src/main/libs/clients/PostgreSQLClient.js b/src/main/libs/clients/PostgreSQLClient.js
index af9a4a56..ed7ec319 100644
--- a/src/main/libs/clients/PostgreSQLClient.js
+++ b/src/main/libs/clients/PostgreSQLClient.js
@@ -9,7 +9,6 @@ function pgToString (value) {
    return value.toString();
 }
 
-types.setTypeParser(20, a => parseInt(a));// bigint string to number
 types.setTypeParser(1082, pgToString); // date
 types.setTypeParser(1083, pgToString); // time
 types.setTypeParser(1114, pgToString); // timestamp
diff --git a/src/main/libs/clients/SQLiteClient.js b/src/main/libs/clients/SQLiteClient.js
index 1323434e..920aa95a 100644
--- a/src/main/libs/clients/SQLiteClient.js
+++ b/src/main/libs/clients/SQLiteClient.js
@@ -163,7 +163,7 @@ export class SQLiteClient extends AntaresCore {
             nullable: !field.notnull,
             unsigned: null,
             zerofill: null,
-            order: field.cid + 1,
+            order: typeof field.cid === 'string' ? +field.cid + 1 : field.cid + 1,
             default: field.dflt_value,
             charset: null,
             collation: null,
diff --git a/src/renderer/components/ForeignKeySelect.vue b/src/renderer/components/ForeignKeySelect.vue
index b0afb960..8412f133 100644
--- a/src/renderer/components/ForeignKeySelect.vue
+++ b/src/renderer/components/ForeignKeySelect.vue
@@ -7,7 +7,7 @@
       @blur="$emit('blur')"
    >
       <option v-if="!isValidDefault" :value="value">
-         {{ value }} - {{ $t('message.invalidDefault') }}
+         {{ value === null ? 'NULL' : value }}
       </option>
       <option
          v-for="row in foreignList"