Minor changes, mostly to the Makefile