Xylon fix ups