Fixes for parallel start