Some fixes to Makefile