Fixes for new scheduling class