Minor updates to Makefile