xcb/glx fixes