Fixes to tables, round 3