Fixed regexes all around