Fix more callbacks, Thanx Gabriel!