fixes for relocation