Added some case sensitive fixes