fix bugs for 6.23 test