Minor bug fixes of scheduling process

Change-Id: I47ad343496aff29016941f6c894c517136f992d5