Starting some fixes to tables