Add missing changes and bump to 2.2.1