More case sensitivity fixes