Hopper scheduling fixes