More save fixes