Rewrite offset tracking, fix change addresses