Xenoborg fixes