Some xen related fixes

Fix some UI Xen related but, see commit for details.