PROG-372: fix pipeline + transaction errors