Further scheduler upgrades