Fixing more makefile badness