and more makefile fixes