Adapt to Lunchbox UUID changes