Fixes for Waveform 3