Properly support relative addressing