Small changes for save