partial makefile fixes