Skip to content

Scheduler fixes

Scheduler fixes #1357