Fixes table creation