Additional table fixes