Fix some data corruption.