Fixing conf and makevars