fixes for case-sensitivity