Fix up a few of the constants, still not happy with how we are sharing these.