Some minor interface changes.