More scheduling fixes and work