Minor fix for waveform and 'empty' time codes