fix some small bug.