Some minor adjustments to tables