BufferedDataSink fixes