Scheduler fix changes

[Elson9]

Description

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Documentation (non-breaking change with enhancements to documentation)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist

• I have checked that unit tests pass locally with my changes
• I have added tests that prove my fix is effective or that my feature works
• I have added necessary documentation (if appropriate)

Further comments