Just some slight improvements of the B2B broker code