attempt to fix codegen ... at least generated code builds now