Chenged a couple of defines.