Part 2 of Rust Balance Fixes