More fixes for parallel start