More library changes.