Some X11 fixes (not yet working)