Fix waveform definitions