Fixes and modfiications for distant/local hybrid jobs.