Fix a few more places where the case insensitive hash should be used since