Several small fixes for ham_bench and the new Btree types