codegen bug fix + gl header annoyances