Minor updates to clean the job up