minor changes related to code generation