Adapt to changes for Eyescale/Lunchbox#18