Fix missing macros