Further Scheduler tweaks