Scheduler proposal tweaks

Change-Id: Ib49cb1ea39b9ae0996221f7d0f06bc9ffb1136dc