Fixing P/T regexes