Tweaks, strip some regex rules