Windows installer further tweaks