Align with the latest libs.