Made a few further regex changes