Case sensitive fixes