Fix wrt. recent changes.