More changes to scheduler

Change-Id: I4f530a457283569b2198dfabf8fa9e9ff23df564