BUG: fix some codepaths broken by the install from build change.
BUG: fix some codepaths broken by the install from build change.

cournape/Bento,cournape/Bento,abadger/Bento,abadger/Bento,cournape/Bento,abadger/Bento,cournape/Bento,abadger/Bento