Fixed wavelet functions to conform to standard