Some more scheduler "improvements"