fix some place