Bug fixes related to suspend/resume instance.