small regex fixes