regex fixes