Minor host instance state fixes
Merge pull request #185 from nhr/master

Minor host instance state fixes