Minor fixes to new gracious save behavior