various x11 fixes