Updated for windows binaries