GEN: fixes for types in class header