Make addr patching easier