Type code corrections