fix up for finalized interfaces