Internal relocations (take 2)