Fix typo in regex
Resolve ISE warning messages