Minor host instance state fixes