Updated calculations of diffusion and advection in FVM