Small fixes on the way to Xen support

Hi!

These two changes are a small step forward towards supporting Xen. I was debugging the generated XML file yesterday but haven't got a buildable version yet.
Anyway, these two changes should help a little ;)

Best
  Martin