Windows and install fixes

Merge request reports