Fix the scheduler not being applied correctly everywhere...