Update for latest rust
Clean up some warnings