Fixed save bugs