Fix dispersion
Fix smoketests