- Fix more issues with async scheduler and cancelling pending task