Windows API usage updates from #1069