Fix job creation issues