Also eliminate races in unpooled buffers
Fix races