Fix build against new lunchbox and upcoming collage change