Additional Makefile optimization