Even more makefile fixes