Minor improvements in Makefile