Adding temp GL selection fixes for mac from John's patch.