Fix bugs related to distro and logo spoofing.