fix some bugs in 6.3