fixes and changes for 2.2.3