Minor updates to code generation