Fix minor Makefile problems