Fix greedyness of regexes