More constant fixes.