A few more state tweaks to the pause/stop/save/resume logic