Fixed distro and tool for 2.9.