Some X11 fixes