Reordered a few GL calls to prevent future conflicts