Small Makefile fixes