Tweaks to tables