Fixes for Edits not persisting after a re-load