diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 0e215bae9..9071cdfd8 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -325,7 +325,7 @@ CREATE TABLE `Groups` (
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
---Table structure for table `Groups_Monitors`
+-- Table structure for table `Groups_Monitors`
 --
 
 DROP TABLE IF EXISTS `Groups_Monitors`;
@@ -845,16 +845,20 @@ INSERT INTO ZonePresets VALUES (5,'Best, low sensitivity','Active','Percent','Bl
 INSERT INTO ZonePresets VALUES (6,'Best, medium sensitivity','Active','Percent','Blobs',40,NULL,16,NULL,5,5,12,NULL,10,NULL,1,NULL,0,0);
 INSERT INTO ZonePresets VALUES (7,'Best, high sensitivity','Active','Percent','Blobs',20,NULL,8,NULL,3,3,6,NULL,5,NULL,1,NULL,0,0);
 
+DROP TABLE IF EXISTS Maps;
+
 CREATE TABLE Maps (
   `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`      TEXT NOT NULL,
-  `Filename`  TEXT NOT NULL default '',
+  `Name`      VARCHAR(64) NOT NULL,
+  `Filename`  VARCHAR(64) NOT NULL default '',
   `NumCoords` tinyint(3) unsigned NOT NULL default '0',
   `Coords` tinytext NOT NULL,
   `ParentId`   int(1) unsigned,
   PRIMARY KEY (`Id`)
 );
 
+DROP TABLE IF EXISTS MontageLayout;
+
 CREATE TABLE MontageLayouts (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name`    TEXT  NOT NULL,