Minor fixes in the scheduling process - adrien