Moar Xeno bugfixes