Xenguest misc v2

No noticeable functional difference