Makefile and small fix