Misc fixes to xenguest

No noticeable functional difference