More regex changes