Fix windows Makevars