format fixes to xen part 1