one xen fix and one style improvement