Slight changes to table creation code.