Bugs/fix backpressure blockage