Makevars and repo fixes