Initial work on fixing BufferPoolAV