More fixes to save