Work on Makevars.win