Corrections in windows build