Minor changes.
Interface changes.