Fix two Rhizome Direct test cases
Fix bugs revealed by test failures

Introduced by the recent change to rhizome_bid_t everywhere