Changes to support Andy's new CPU scheduler