More offset macros in need of a change