fix some small defect