Jobtype rework fixes