fixes in scheduler