Some x11 fixes