[junjiang2] fix some bugs