Fixing some save issues.