[fix] fix some problems