Bug fixes save issues