Fix for changed macro definitions