buildout fixes from 996c7950ccca49567693b890f37f113a227fff80