Various changes to tables for instance