New save flow fixes