Additional Makefile modifications