Fix bugs related to case sensitivity