Fix stuff in distro code.