changes required for 2.2 compatibility