Changes needed after Eyescale/Lunchbox#91