Makefile imporvements