Improvements for 2.2 compatibility