Some fixes in Poly's pipeline