Fixed regex issues