More xenos fixes