More Regex issues found and fixed