Small regex fixes.