Bug fixes.
Could run this development buildout without error for the first time.