Update for latest version of rust