Minor fixes on regular expressions.