Riverbasim: multiple changes