Regex updates, etc.