makefile fixes