Fix bugs with hyphen as an alias and in parsing of '='