[DEV]fix some bugs