Resolve saving issues