Fix a regression of not saving dependencies for jobs correctly.
Fix a scaffolding problem.