updates to work with latest bocho