Update to use River 2.2.1