Windows build fix part 1