Makefile var fixes