SPEED: Missed a couple of values that should be consts