added some scheduler-related fixes