Fixed case-sensitivity issue, and misc others