Fix more callbacks