More scheduler changes