this and that codegen fix and so on