even more makefile fixes