sched: couple patches from mainline