Continue fixing save objects