Some minor changes for windows compilation