more pipeline fixes