Preg match fixes