Fix macro definitions