Variety of Fixes

... found while working on backpressure.