Makefile updates contributed by Reid