Nightly fixes and GL simplification (for now)