Few update for windows version