Some small changes in preparation for saving configurations and jobs.