Little Makefile fixes