Updates for 2.2.1 patch