Buffer and compressor fixes