Improve Makefile behaviour