Corrected variables for Wave constructors.