Fixed more case sensitive issues