GEN: more fixes for class header types