Fixing save errors