Modifications to support the latest library changes.