Couple of fixes in relocator load