various fixes for 12.2.1