Fixes in job_templates branch before merging