Fix Rust breaking changes
Fix deprecation warnings, minor cleanup