Small Makefile changes; really fixes build