Changes to the Makefiles for packages