Actually fixed the constant references (< 5.5)