Fix some suggestions from @bvssvni, update for newer Rust compiler, and rebuild with rsi-ng branch, which is a bit nicer