some fixes to Makefile