Enhance handling of bufferpool allocated by peer