constant fixes