More fixes to diffusion.