Fix build against new lunchbox and upcoming collage change
Merge pull request #309 from eile/master

Fix build against new lunchbox and upcoming collage change