Fixes for new case sensitivity rules.