Fixing save bugs