Tweaks to regex