Fixed makevars