Fixing and patching Bakery.