Some Makefile love

A few not very significant makefile changes.