Fixes for multi step jobs