Various makefile changes etc