Fixed validation regular expressions bugs