fix misc. issues in Makefile