Misc fixes to xenguest

No noticeable differences to functionality