Update for library changes.