diff --git a/main/install/db_main.sql b/main/install/db_main.sql
index c87a8b5dac..1f0a775241 100644
--- a/main/install/db_main.sql
+++ b/main/install/db_main.sql
@@ -2302,7 +2302,7 @@ CREATE TABLE search_engine_ref (
 --
 
 CREATE TABLE session_category (
-  id int(11) NOT NULL auto_increment,
+  id int NOT NULL auto_increment,
   name varchar(100) default NULL,
   date_start date default NULL,
   date_end date default NULL,
diff --git a/main/install/db_stats.sql b/main/install/db_stats.sql
index b8811f998e..60442ee23e 100644
--- a/main/install/db_stats.sql
+++ b/main/install/db_stats.sql
@@ -219,12 +219,12 @@ CREATE TABLE track_e_course_access (
 );
 
 CREATE TABLE track_e_hotspot (
-  hotspot_id int(11) NOT NULL auto_increment,
-  hotspot_user_id int(11) NOT NULL,
+  hotspot_id int NOT NULL auto_increment,
+  hotspot_user_id int NOT NULL,
   hotspot_course_code varchar(50) NOT NULL,
-  hotspot_exe_id int(11) NOT NULL,
-  hotspot_question_id int(11) NOT NULL,
-  hotspot_answer_id int(11) NOT NULL,
+  hotspot_exe_id int NOT NULL,
+  hotspot_question_id int NOT NULL,
+  hotspot_answer_id int NOT NULL,
   hotspot_correct tinyint(3) unsigned NOT NULL,
   hotspot_coordinate text NOT NULL,
   PRIMARY KEY  (hotspot_id),
diff --git a/main/install/migrate-db-1.6.x-1.8.0-pre.sql b/main/install/migrate-db-1.6.x-1.8.0-pre.sql
index c2eb8dd47f..7415cf6082 100755
--- a/main/install/migrate-db-1.6.x-1.8.0-pre.sql
+++ b/main/install/migrate-db-1.6.x-1.8.0-pre.sql
@@ -261,9 +261,9 @@ CREATE TABLE group_rel_tutor(id int NOT NULL auto_increment, user_id int NOT NUL
 -- tool_intro table
 
 -- dropbox_file table
-ALTER TABLE dropbox_file ADD cat_id INT(11) NOT NULL ;
+ALTER TABLE dropbox_file ADD cat_id INT NOT NULL ;
 -- dropbox_post table
-ALTER TABLE dropbox_post ADD cat_id INT(11) NOT NULL ;
+ALTER TABLE dropbox_post ADD cat_id INT NOT NULL ;
 -- dropbox_person table
 CREATE TABLE dropbox_category(cat_id int NOT NULL auto_increment, cat_name text NOT NULL, received tinyint unsigned NOT NULL default 0, sent tinyint unsigned NOT NULL default 0, user_id int NOT NULL default 0, PRIMARY KEY  (cat_id));
 CREATE TABLE dropbox_feedback(feedback_id int NOT NULL auto_increment, file_id int NOT NULL default 0, author_user_id int NOT NULL default 0, feedback text NOT NULL, feedback_date datetime NOT NULL default '0000-00-00 00:00:00', PRIMARY KEY  (feedback_id), KEY file_id (file_id), KEY author_user_id (author_user_id));
diff --git a/main/install/migrate-db-1.8.3-1.8.4-pre.sql b/main/install/migrate-db-1.8.3-1.8.4-pre.sql
index f8fb4cd681..f03658c5c7 100755
--- a/main/install/migrate-db-1.8.3-1.8.4-pre.sql
+++ b/main/install/migrate-db-1.8.3-1.8.4-pre.sql
@@ -26,7 +26,7 @@ INSERT INTO settings_options(variable,value,display_text) VALUES ('default_forum
 INSERT INTO settings_options(variable,value,display_text) VALUES ('default_forum_view', 'nested', 'Nested');
 
 -- xxSTATSxx
-CREATE TABLE track_e_hotspot (hotspot_id int NOT NULL auto_increment, hotspot_user_id int NOT NULL, hotspot_course_code varchar(50) NOT NULL, hotspot_exe_id int NOT NULL, hotspot_question_id int(11) NOT NULL, hotspot_answer_id int NOT NULL, hotspot_correct tinyint unsigned NOT NULL, hotspot_coordinate varchar(50) NOT NULL, PRIMARY KEY  (hotspot_id),  KEY hotspot_course_code (hotspot_course_code), KEY hotspot_user_id (hotspot_user_id), KEY hotspot_exe_id (hotspot_exe_id), KEY hotspot_question_id (hotspot_question_id));
+CREATE TABLE track_e_hotspot (hotspot_id int NOT NULL auto_increment, hotspot_user_id int NOT NULL, hotspot_course_code varchar(50) NOT NULL, hotspot_exe_id int NOT NULL, hotspot_question_id int NOT NULL, hotspot_answer_id int NOT NULL, hotspot_correct tinyint unsigned NOT NULL, hotspot_coordinate varchar(50) NOT NULL, PRIMARY KEY  (hotspot_id),  KEY hotspot_course_code (hotspot_course_code), KEY hotspot_user_id (hotspot_user_id), KEY hotspot_exe_id (hotspot_exe_id), KEY hotspot_question_id (hotspot_question_id));
 
 -- xxUSERxx
 
diff --git a/main/install/migrate-db-1.8.4-1.8.5-pre.sql b/main/install/migrate-db-1.8.4-1.8.5-pre.sql
index 25fcb6eee4..b1dabd382b 100755
--- a/main/install/migrate-db-1.8.4-1.8.5-pre.sql
+++ b/main/install/migrate-db-1.8.4-1.8.5-pre.sql
@@ -149,7 +149,7 @@ CREATE TABLE blog_attachment ( id int unsigned NOT NULL auto_increment, path var
 CREATE TABLE forum_attachment (id int NOT NULL auto_increment, path varchar(255) NOT NULL, comment text, size int NOT NULL default 0, post_id int NOT NULL, filename varchar(255) NOT NULL, PRIMARY KEY (id));
 ALTER TABLE group_category ADD forum_state TINYINT DEFAULT 0 AFTER announcements_state;
 UPDATE tool SET category='interaction', admin='0', visibility='0' WHERE name='survey';
-CREATE TABLE  forum_notification (user_id int(11) , forum_id varchar(11), thread_id varchar(11), post_id varchar(11), KEY user_id (user_id), KEY forum_id (forum_id));
+CREATE TABLE  forum_notification (user_id int, forum_id varchar(11), thread_id varchar(11), post_id varchar(11), KEY user_id (user_id), KEY forum_id (forum_id));
 ALTER TABLE quiz ADD access_condition text DEFAULT NULL;
 ALTER TABLE survey ADD access_condition text DEFAULT NULL;
 UPDATE tool SET category='authoring' WHERE name = 'announcement';
diff --git a/main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql b/main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql
index 68e3cd2046..c206b3590b 100755
--- a/main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql
+++ b/main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql
@@ -18,7 +18,7 @@ ALTER TABLE session ADD COLUMN session_category_id INT NOT NULL;
 
 ALTER TABLE session_rel_course_rel_user ADD COLUMN visibility int NOT NULL default 1;
 ALTER TABLE session_rel_course_rel_user ADD COLUMN status int NOT NULL default 0;
-CREATE TABLE session_category (id int(11) NOT NULL auto_increment, name varchar(100) default NULL, date_start date default NULL, date_end date default NULL, PRIMARY KEY  (id));
+CREATE TABLE session_category (id int NOT NULL auto_increment, name varchar(100) default NULL, date_start date default NULL, date_end date default NULL, PRIMARY KEY  (id));
 
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('allow_coach_to_edit_course_session', NULL, 'radio', 'Course', 'false', 'AllowCoachsToEditInsideTrainingSessions', 'AllowCoachsToEditInsideTrainingSessionsComment', NULL, NULL, 0);
 INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url, access_url_changeable) VALUES ('show_courses_descriptions_in_catalog', NULL, 'radio', 'Course', 'true', 'ShowCoursesDescriptionsInCatalogTitle', 'ShowCoursesDescriptionsInCatalogComment', NULL, NULL, 1, 1);