Fix minor makefile problems