Changes to support the latest library modifications.