Updated for windows fixes