Fix macro warnings