Slight improvements in Makefile