Update for latest b2 idiosyncracies