Fixed macros for ARC