relocator fixes from staging