Scheduler tweaks