More scheduler work