Update for latest nickel.