Fixing errors in Save()