Scheduling improvements