behavior fixes