Minor improvements to Makefile