Fixed up the constant values that weren't working before