Minor mods to the tables