Add regex fixes for certain cases