Fix some connection pooling issues discovered while porting.