fix two more state resuming issues