Fix dumb makefile and codegen errors