Fix direct waveform upload methods.

--BRJ and CAR