Make these defines, and tweak them down