Fix something in buildout and makefile