Fixes for job generation.