Changes JB made to eliminate some errors when sourcing Makefile. Some errors remain.