Fixing some update/save bugs