Handle new version of Wix Installer and improve cab target