Minor tweaks for unsaved changes payload