Fix some table issues