A few more makefile fixes