Minor regular expression updates