Some pointer macros added/changed