Fixed some regex issues