Minor api changes.