Minor fixes in waveform highlighting.