update version handling for 2.2