Some makefile changes