Updating per rust changes and docs