code generator adjustments