Fixes for job generation.
Merge branch 'master' into home
Updated for latest template changes.