Fix several hypen-use-as-minus-sign issues