Makefile cleanup

Two small fixes