Fix the regex
Update more files