Edits to bring up-to-date with library changes