fix incompatabilities with reworked flapjack-diner interface