Makefile adjustements