Update for latest Compass.