Fix two nasty --all-machines scheduling bugs