fixes to the guest types