Made makefile safe