Fix more notify errors