Fix tables (again)