Added relocalization fixes (diff with working-reloc)