Moved a define and fixed another.