More minor interface changes.