Makefile adjustements 2