Fix more change event bugs