Windows build support part 2