Makefile optimization changes