Added some better support for distro variations and version variations