Try to fix Windows build too