Various jobtype rework fixes

A couple of mostly unconnected fixes for the jobtype_rework branch.