Some fix of windows supporting