Small interface changes.