more constant fixes