More regex fixes