Fix some macro definitions