Fixed a few issues with schedulers