Make it work on windows

+ some small build cleanup / deps update