Yet more changes to the Makefile