Minor fixes on some regular expressions.