Some cleanup and other GL state changes

Not that this has any effect or anything