Some minor updates for windows