Fix buildout issues.