Make one change to fix a unit test compilation issue. Also, fix a deadlock in the job exiting code caused by my changes yesterday.