Fixed some RegEx problems.