02.12.14 Makevars fixes