Various table tweaks and fixes