Fix makevars