fixes in the generated code