Some minor changes to fix case-sensitivity