2.2 release, bug fixes