Minor fixes to make sure all bins are correctly handled (even top-most) which were special cases previously.