Various interface changes.