Fixed saving issues