Small changes in the Makefile and installation script