Fix minor save/restore issues.