Fix the retrieval of the RW offsets using the correct functions