Fixes for writeback (experimental)