Small changes to make binsearch work in this release