API fixes for 2.2.0