Fixed ordering of table creation