Better X11 support.