Fixing packaging issues on windows