Fixes for New Schedulers.

Change-Id: If44e47327049a955a2492c206309e3847e0b576a