Fix creation of database and table creation too