Final adjustments for 2.2.1