Minor REGEX changes.