Touchups to makefile