Scheduling fixes