Code changes due to GL client changes