some constant fixes