Revert "Revert "Minor adjustments map-jobs""

This reverts commit 3d9e88b34dee06aaea0911dfbdb40c88453adff6.