New schedulers tweaks