Very minor changes to the table behaviour