some behavior fixes