Work improvements to repair OpenGL sample back