Fix pipelineing in server parts