Minor fixes to diffusion extraction