Some improvements to the Bakery.