added Makefile fixes