Some more tweaks for windows packaging