lot of fixes, preparing for 9.2.2