Several changes to help with the wavelength issue