More fixing bugs for distro.