Added missing macros.