various changes to make dist_bh consistent