Makefile hopeful fixes