final Makefile fixes...