A few distro fixes for Windows support