Fix property macros