Make some small changes in makefile