Tweaks to Windows package