Fix Relocator regressions