Fix helper macros