Fix XLIB with Josh's help.