some save-resume data fixes