Update for ICC build.