- Added better reporting of context for rewrite failures in failure log