Fix regular expressions