Fix build following codegen patch