Fix relative addressing wrapping