A few distro fixes