Changes to have consistency across tables, minor fixes.