Fix relocation issues