Windows build fix (3)