various scheduler changes