More tweaks to the regex