Make finishing flows work