removing some more issues with the generated code