some minor changes due to code generation