Bug fixes for save format