Fixing case sensitive issues