Fixed a few issues with schedulers
Fixed a few issues with schedulers