Bug fixes with the scheduler classes