Some more fixes for buildout