Hopefully last fixes for RUST operation.