Makefile fixes