Additional changes to windows packaging.