Fix some table inconsistencies, but this section will change no doubt.