Wip 8858

Various bucket listing fixes.