Fixed linkage errors under VC on the new version