Makefile refinements
Avoid compiler warning
Makes C++ package standalone