further updates to Makevars.win