Slight code generator changes