Update to 1.22.1, enable more options