More xeno stuff fixes