Moved a few constants