Makefile, conf fixes for building in a buildout.