Makefile and env adder stuff