fixes to the guest types - merge conflicts