More fixes to tables