Fix run-rust and clean up some other stuff