fixes for DRILL-932
fixes for parallel control