Fixes for waveform plot with < 4 channels, unix line endings