bugfixes for tuxedo pipeline