various fixes for 2.3