Fixed a few bugs in the new scheduler.