Variety of Fixes

... found while working on backpressure.
Well that's just silly ... thanks for the catch.