Correct previous CID fixes.