windows build fixes