Some changes to Makefile