Fix rare regex issues. Shorten lines