Tidying up a couple of things in the Makefile