Windows build fix, update dependencies