Fixing some regexes