Update for latest Cargo