Several fixes to the table models.