Update for newer rust and newer libs