Make Windows build more robust