Fix relative offset truncation
Merge branch 'prq'