Fixed gl header related compile errors.
Misc other updates.