Add "Unsaved Changes" and fixup some collaboration cases