Several constant fixes