Fix Makevars