Bug fixing in the GL build