Several minor tweaks for TableMode