Improved Makefile rules