OGL and related fixes