Fix Bento build.
Merge pull request #643 from stefanv/bento_fixes

Fix Bento build.