Fix some merge issues and make the constants real constants :-)