Another take at Makefile corrections...