Fixes in diff engine and redirects.