SndBuf fixes