fix some minor bug