scheduling fixes