Fixes for DataBuffer in order to support new API