writeback edits fixes