More modifications for job control.