SaveData: Addressed some issues