Various behavior fixes