Some regex changes