Minor changes for schedule testing.