Fixes to bakery