Added misc. fixes for block reading of waveform data.