fixes for breaks caused by multi type pipeline