Update to 0.22.1