Fix Makefile reference
Few minor fixes/cleanup