Fixing save problems