Fix job and template