Handle new versions of Wix Installer and improve cab target